svn commit: r1701599 - /sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/cluster/TopologyEventTest.java

[st...@apache.org]

Author: stefanegli
Date: Mon Sep  7 10:24:53 2015
New Revision: 1701599

URL: http://svn.apache.org/r1701599
Log:
SLING-4991 : fix for testNonDelayedInitEvent part 2: also increasing the min event delays to ensure that TOPOLOGY_CHANGED doesn't happen while the late listener is registered and expects the TOPOLOGY_INIT to have a changed false

Modified:
    sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/cluster/TopologyEventTest.java

Modified: sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/cluster/TopologyEventTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/cluster/TopologyEventTest.java?rev=1701599&r1=1701598&r2=1701599&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/cluster/TopologyEventTest.java (original)
+++ sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/cluster/TopologyEventTest.java Mon Sep  7 10:24:53 2015
@@ -191,7 +191,7 @@ public class TopologyEventTest {
     public void testNonDelayedInitEvent() throws Throwable {
         logger.info("testNonDelayedInitEvent: start");
         instance1 = Instance.newStandaloneInstance("/var/discovery/impl/", 
-                "firstInstanceB", true, 20 /* heartbeat-timeout */, 5 /*min event delay*/,
+                "firstInstanceB", true, 20 /* heartbeat-timeout */, 10 /*min event delay*/,
                 UUID.randomUUID().toString(), false /*delayInitEventUntilVoted*/);
         AssertingTopologyEventListener l1 = new AssertingTopologyEventListener("instance1.l1") {
             private volatile boolean firstEvent = false;
@@ -229,7 +229,7 @@ public class TopologyEventTest {
         assertEquals(0, l1.getUnexpectedCount());
         
         instance2 = Instance.newClusterInstance("/var/discovery/impl/", 
-                "secondInstanceB", instance1, false, 20, 5, UUID.randomUUID().toString(), false);
+                "secondInstanceB", instance1, false, 20, 10, UUID.randomUUID().toString(), false);
         AssertingTopologyEventListener l2 = new AssertingTopologyEventListener("instance2.l2");
         l2.addExpected(Type.TOPOLOGY_INIT);
         instance2.bindTopologyEventListener(l2);
@@ -302,11 +302,11 @@ public class TopologyEventTest {
         late.addExpected(Type.TOPOLOGY_INIT);
         instance1.bindTopologyEventListener(late);
 
-        // wait until CHANGED is sent - which is 3 sec after CHANGING
+        // wait until CHANGED is sent - which is 10 sec after CHANGING - we already waited 3 sec above, so 12sec more should be enough
         l1.addExpected(Type.TOPOLOGY_CHANGED);
         l1Two.addExpected(Type.TOPOLOGY_CHANGED);
         l2.addExpected(Type.TOPOLOGY_CHANGED);
-        Thread.sleep(4000);
+        Thread.sleep(12000);
         final Iterator<TopologyEvent> it = l1.getEvents().iterator();
         while(it.hasNext()) {
         	final TopologyEvent e = it.next();