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

[stefanegli]

Author: stefanegli
Date: Tue Jan 13 14:04:29 2015
New Revision: 1651345

URL: http://svn.apache.org/r1651345
Log:
SLING-4302 : making timeouts more robust for CI

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

Modified: 
sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/cluster/ClusterTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/cluster/ClusterTest.java?rev=1651345&r1=1651344&r2=1651345&view=diff
==============================================================================
--- 
sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/cluster/ClusterTest.java
 (original)
+++ 
sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/cluster/ClusterTest.java
 Tue Jan 13 14:04:29 2015
@@ -144,9 +144,10 @@ public class ClusterTest {
        instance1.stopHeartbeats();
         instance2.stop();
         instance1.stop();
-        instance1 = Instance.newStandaloneInstance("/var/discovery/impl/", 
"firstInstance", true, 1, 1);
+       // SLING-4302 : first set the heartbeatTimeout to 100 sec - large 
enough to work on all CI instances
+        instance1 = Instance.newStandaloneInstance("/var/discovery/impl/", 
"firstInstance", true, 100, 1);
         instance2 = Instance.newClusterInstance("/var/discovery/impl/", 
"secondInstance", instance1,
-                false, 1, 1);
+                false, 100, 1);
         assertNotNull(instance1);
         assertNotNull(instance2);
 
@@ -185,6 +186,9 @@ public class ClusterTest {
         assertEquals(2, 
instance2.getClusterViewService().getClusterView().getInstances().size());
         
         // let instance2 'die' by now longer doing heartbeats
+       // SLING-4302 : then set the heartbeatTimeouts back to 1 sec to have 
them properly time out with the sleeps applied below
+        instance2.getConfig().setHeartbeatTimeout(1);
+        instance1.getConfig().setHeartbeatTimeout(1);
         instance2.stopHeartbeats(); // would actually not be necessary as it 
was never started.. this test only runs heartbeats manually
         instance1.runHeartbeatOnce();
         Thread.sleep(500);