You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by st...@apache.org on 2015/02/03 11:49:43 UTC
svn commit: r1656673 -
/sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/topology/TopologyTest.java
Author: stefanegli
Date: Tue Feb 3 10:49:43 2015
New Revision: 1656673
URL: http://svn.apache.org/r1656673
Log:
SLING-4300 : further test stabilization..
Modified:
sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/topology/TopologyTest.java
Modified: sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/topology/TopologyTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/topology/TopologyTest.java?rev=1656673&r1=1656672&r2=1656673&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/topology/TopologyTest.java (original)
+++ sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/topology/TopologyTest.java Tue Feb 3 10:49:43 2015
@@ -52,7 +52,7 @@ public class TopologyTest {
public void testTwoNodes() throws Throwable {
Instance instance1 = TopologyTestHelper.createInstance(instances, "instance1");
Instance instance2 = TopologyTestHelper.createInstance(instances, "instance2");
- instance1.getConfig().setHeartbeatTimeout(5);
+ instance1.getConfig().setHeartbeatTimeout(4);
instance1.getConfig().setHeartbeatInterval(1);
instance2.getConfig().setHeartbeatTimeout(1);
instance2.getConfig().setHeartbeatInterval(1);
@@ -94,8 +94,7 @@ public class TopologyTest {
instance2.getAnnouncementRegistry().listLocalAnnouncements();
assertEquals(1, instance2LocalAnnouncements.size());
- instance1.getConfig().setHeartbeatTimeout(3); // increasing heartbeat timeout from 2 to 3sec
- Thread.sleep(1500); // heartbeat interval is 1 sec - so 1.5 sec ensures 1 heartbeat is actually being sent out!
+ Thread.sleep(1100); // sleep of 1.1sec ensures instance2's heartbeat timeout (which is 1sec) hits
instance1LocalAnnouncements =
instance1.getAnnouncementRegistry().listLocalAnnouncements();
@@ -103,7 +102,6 @@ public class TopologyTest {
instance2LocalAnnouncements =
instance2.getAnnouncementRegistry().listLocalAnnouncements();
assertEquals(0, instance2LocalAnnouncements.size());
- instance1.getConfig().setHeartbeatTimeout(2);
logger.info("testTwoNodes: instance1: "+instance1.slingId);
instance1.dumpRepo();
@@ -112,7 +110,7 @@ public class TopologyTest {
TopologyTestHelper.assertTopologyConsistsOf(instance1.getDiscoveryService().getTopology(), instance1.getSlingId(), instance2.getSlingId());
TopologyTestHelper.assertTopologyConsistsOf(instance2.getDiscoveryService().getTopology(), instance2.getSlingId());
- Thread.sleep(1000);
+ Thread.sleep(3000); // another sleep 3s (1.1+3 = 4.1sec) ensures instance1's heartbeat timeout (which is 4sec) hits as well
instance1LocalAnnouncements =
instance1.getAnnouncementRegistry().listLocalAnnouncements();
assertEquals(0, instance1LocalAnnouncements.size());