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/01/29 18:09:12 UTC
svn commit: r1655747 - /sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/cluster/ClusterTest.java

Author: stefanegli
Date: Thu Jan 29 17:09:12 2015
New Revision: 1655747

URL: http://svn.apache.org/r1655747
Log:
SLING-4139 / SLING-3726 : stop instance1Restarted to avoid their listeners still receiving repository events and fiddling with downstream tests

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=1655747&r1=1655746&r2=1655747&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 Thu Jan 29 17:09:12 2015
@@ -225,6 +225,7 @@ public class ClusterTest {
         assertTopology(instance1Restarted, new SimpleClusterView(instance1Restarted, instance2));
         assertTopology(instance3, new SimpleClusterView(instance3));
         assertTopology(instance2, new SimpleClusterView(instance1Restarted, instance2));
+        instance1Restarted.stop();
         logger.info("testStaleAnnouncementsVisibleToClusterPeers4139: end");
     }
     
@@ -270,6 +271,7 @@ public class ClusterTest {
         logger.info("instance3.slingId: "+instance3.slingId);
         instance1Restarted.dumpRepo();
         assertSameTopology(new SimpleClusterView(instance1Restarted, instance2), new SimpleClusterView(instance3));
+        instance1Restarted.stop();
 
         logger.info("testDuplicateInstanceIn2Clusters4139: end");
     }
@@ -405,6 +407,8 @@ public class ClusterTest {
         assertSameTopology(new SimpleClusterView(instance1Restarted, instance2), 
                 new SimpleClusterView(instance3), 
                 new SimpleClusterView(instance5));
+        instance1Restarted.stop();
+
     }
 
     @Test
@@ -504,6 +508,7 @@ public class ClusterTest {
         assertSameTopology(new SimpleClusterView(instance1Restarted, instance2), 
                 new SimpleClusterView(instance3, instance4), 
                 new SimpleClusterView(instance5));
+        instance1Restarted.stop();
         logger.info("testDuplicateInstance3726: end");
     }
 
@@ -611,6 +616,8 @@ public class ClusterTest {
         assertSameTopology(
                 new SimpleClusterView(instance3),
                 new SimpleClusterView(instance4));
+        instance1Restarted.stop();
+
         logger.info("testStaleInstanceIn3Clusters4139: end");
     }