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/11/17 14:22:50 UTC

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

Author: stefanegli
Date: Tue Nov 17 13:22:49 2015
New Revision: 1714777

URL: http://svn.apache.org/viewvc?rev=1714777&view=rev
Log:
SLING-5306 : avoid instance surviving a this test by properly shutting test down

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

Modified: sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/cluster/RepositoryDelaysTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/cluster/RepositoryDelaysTest.java?rev=1714777&r1=1714776&r2=1714777&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/cluster/RepositoryDelaysTest.java (original)
+++ sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/cluster/RepositoryDelaysTest.java Tue Nov 17 13:22:49 2015
@@ -26,7 +26,6 @@ import org.apache.log4j.Level;
 import org.apache.log4j.LogManager;
 import org.apache.sling.discovery.TopologyView;
 import org.apache.sling.discovery.TopologyEvent.Type;
-import org.apache.sling.discovery.base.its.setup.VirtualInstance;
 import org.apache.sling.discovery.base.its.setup.VirtualInstanceBuilder;
 import org.apache.sling.discovery.base.its.setup.mock.AssertingTopologyEventListener;
 import org.apache.sling.discovery.impl.setup.FullJR2VirtualInstance;
@@ -85,7 +84,7 @@ public class RepositoryDelaysTest {
     @Test
     public void testSlowSessionSaves() throws Exception {
         VirtualInstanceBuilder builder1 = newBuilder();
-        VirtualInstance instance1 = builder1
+        instance1 = (FullJR2VirtualInstance) builder1
                 .setDebugName("firstInstance")
                 .newRepository("/var/discovery/impl/", true)
                 .setMinEventDelay(0)
@@ -93,7 +92,7 @@ public class RepositoryDelaysTest {
                 .setConnectorPingTimeout(3)
                 .build();
         VirtualInstanceBuilder builder2 = newBuilder();
-        VirtualInstance instance2 = builder2
+        instance2 = (FullJR2VirtualInstance) builder2
                 .setDebugName("secondInstance")
                 .useRepositoryOf(instance1)
                 .setMinEventDelay(0)