From dc1ab1ad994d49512a76fcc6a40143aff8e83e7b Mon Sep 17 00:00:00 2001
From: Rui Han <ruhan@redhat.com>
Date: Thu, 24 Oct 2019 14:50:44 +0800
Subject: [PATCH] Start cassandra before fixture server

---
 .../core/AbstractIndyFunctionalTest.java      |  6 +++---
 ...upMembershipAddMayDisruptMetadataTest.java | 20 ++++++++++++-------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/ftests/common/src/main/java/org/commonjava/indy/ftest/core/AbstractIndyFunctionalTest.java b/ftests/common/src/main/java/org/commonjava/indy/ftest/core/AbstractIndyFunctionalTest.java
index 7362d7a484..bd6dc8146d 100644
--- a/ftests/common/src/main/java/org/commonjava/indy/ftest/core/AbstractIndyFunctionalTest.java
+++ b/ftests/common/src/main/java/org/commonjava/indy/ftest/core/AbstractIndyFunctionalTest.java
@@ -111,6 +111,9 @@ public void run()
 
             Thread.currentThread().setName( getClass().getSimpleName() + "." + name.getMethodName() );
 
+            EmbeddedCassandraServerHelper.startEmbeddedCassandra();
+            logger.debug( "Embedded Cassandra server started" );
+
             fixture = newServerFixture();
             fixture.start();
 
@@ -120,9 +123,6 @@ public void run()
                 throw new IllegalStateException( "server fixture failed to boot.", status.getError() );
             }
 
-            EmbeddedCassandraServerHelper.startEmbeddedCassandra();
-            logger.debug( "Embedded Cassandra server started" );
-
             client = createIndyClient();
         }
         catch ( Throwable t )
diff --git a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/GroupMembershipAddMayDisruptMetadataTest.java b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/GroupMembershipAddMayDisruptMetadataTest.java
index fd9b024d03..de15c1b3b1 100644
--- a/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/GroupMembershipAddMayDisruptMetadataTest.java
+++ b/ftests/core/src/main/java/org/commonjava/indy/ftest/core/content/GroupMembershipAddMayDisruptMetadataTest.java
@@ -30,8 +30,6 @@
 import java.util.concurrent.Future;
 
 import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.jgroups.util.Util.assertTrue;
 import static org.junit.Assert.assertThat;
 
 /**
@@ -63,32 +61,40 @@
 public class GroupMembershipAddMayDisruptMetadataTest
         extends GroupMembershipChangeUpdateMetadataTest
 {
+
+    public static class BMHelper {}
+
+    /* @formatter:off */
     @BMRules( rules = {
         @BMRule(
-            name = "Create Rendezvous",
-            targetClass = "MavenMetadataGenerator",
+            name = "Prepare",
+            targetClass = "GroupMembershipAddMayDisruptMetadataTest$BMHelper",
             targetMethod = "<init>",
-            targetLocation = "ENTRY",
-            action = "createRendezvous(\"myRendezvous\", 2)" ),
+            targetLocation = "EXIT",
+            action = "debug(\"createRendezvous...\"); createRendezvous(\"myRendezvous\", 2); flag(\"prepared\")" ),
         @BMRule(
             name = "Wait after generateGroupFileContent",
             targetClass = "MavenMetadataGenerator",
             targetMethod = "generateGroupFileContent",
             targetLocation = "EXIT",
+            condition = "flagged(\"prepared\")",
             action = "debug(\"generateGroupFileContent waiting...\"); rendezvous(\"myRendezvous\"); debug(\"generateGroupFileContent go.\")" ),
         @BMRule(
             name = "Wait after storeArtifactStore",
             targetClass = "AbstractStoreDataManager",
             targetMethod = "storeArtifactStore",
             targetLocation = "EXIT",
+            condition = "flagged(\"prepared\")",
             action = "debug(\"storeArtifactStore waiting...\"); rendezvous(\"myRendezvous\"); debug(\"storeArtifactStore go.\")" ),
     } )
+    /* @formatter:on */
     @Test
     @Category( BytemanTest.class )
     public void run()
             throws Exception
     {
         prepare();
+        BMHelper bmHelper = new BMHelper();
 
         ExecutorService fixedPool = Executors.newFixedThreadPool( 2 );
 
@@ -100,7 +106,7 @@ public void run()
         Callable<String> groupAddTask = new GroupAddCallable( remoteRepositoryC.getKey() );
         Future<String> user2 = fixedPool.submit( groupAddTask );
 
-        Thread.sleep( 2000 );
+        //Thread.sleep( 2000 );
 
         String metadata = user1.get();
         String retCode = user2.get();