Merge pull request #1335 from myronkscott/fix_test

Fix test for slow systems

Author: Myron Scott

tc-server/src/main/java/com/tc/objectserver/entity/ActiveToPassiveReplication.java

@@ -408,9 +408,9 @@ Map<SyncReplicationActivity.ActivityID, ActivePassiveAckWaiter> getWaiters() {
     return waiters;
   }
   // for test
-  void finishPassiveSync(long timeout) throws InterruptedException {
+  boolean finishPassiveSync(long timeout) throws InterruptedException {
     passiveSyncPool.shutdown();
-    passiveSyncPool.awaitTermination(timeout, TimeUnit.MILLISECONDS);
+    return passiveSyncPool.awaitTermination(timeout, TimeUnit.MILLISECONDS);
   }
 
 

tc-server/src/test/java/com/tc/objectserver/entity/ActiveToPassiveReplicationTest.java

@@ -109,7 +109,10 @@ public void testNodeLeft() throws Exception {
     when(activity.getActivityID()).thenReturn(SyncReplicationActivity.ActivityID.getNextID());
     ActivePassiveAckWaiter ack2 = replication.replicateActivity(nowait, replication.passives());
     Assert.assertTrue(ack2.isCompleted());
-    replication.finishPassiveSync(10000);
+    int turns = 1;
+    while (!replication.finishPassiveSync(10000)) {
+      System.out.println("Still waiting for sync shutdown after " + turns++ + "0s");
+    }
     removal.get();
     Assert.assertTrue(replication.getWaiters().isEmpty());
   }