Repository: usergrid Updated Branches: refs/heads/master 303661ca7 -> bb5f2fb2d
Stop parallel execution of tests in EntityCollectionManagerIT temporarily. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/bb5f2fb2 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/bb5f2fb2 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/bb5f2fb2 Branch: refs/heads/master Commit: bb5f2fb2dd2c4f9f0aa726807b928ac9a775e41d Parents: 303661c Author: Michael Russo <mru...@apigee.com> Authored: Mon Jan 23 10:22:31 2017 -0800 Committer: Michael Russo <mru...@apigee.com> Committed: Mon Jan 23 10:22:31 2017 -0800 ---------------------------------------------------------------------- .../persistence/collection/EntityCollectionManagerIT.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/bb5f2fb2/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/EntityCollectionManagerIT.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/EntityCollectionManagerIT.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/EntityCollectionManagerIT.java index dfff51c..1d5d830 100644 --- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/EntityCollectionManagerIT.java +++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/EntityCollectionManagerIT.java @@ -21,6 +21,7 @@ package org.apache.usergrid.persistence.collection; import com.fasterxml.uuid.UUIDComparator; import com.google.inject.Inject; import com.netflix.astyanax.connectionpool.exceptions.ConnectionException; +import net.jcip.annotations.NotThreadSafe; import org.apache.usergrid.persistence.actorsystem.ActorSystemManager; import org.apache.usergrid.persistence.collection.exception.WriteUniqueVerifyException; import org.apache.usergrid.persistence.collection.guice.TestCollectionModule; @@ -46,6 +47,7 @@ import org.apache.usergrid.persistence.model.field.Field; import org.apache.usergrid.persistence.model.field.IntegerField; import org.apache.usergrid.persistence.model.field.StringField; import org.junit.Before; +import org.junit.BeforeClass; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; @@ -64,6 +66,7 @@ import static org.junit.Assert.*; /** @author tnine */ @RunWith( ITRunner.class ) @UseModules( TestCollectionModule.class ) +@NotThreadSafe // this added due to multiple datastax client's causing issues during parallel test execution public class EntityCollectionManagerIT extends AbstractUniqueValueTest { private static final Logger logger = LoggerFactory.getLogger( EntityCollectionManagerIT.class );
