Author: stefanegli Date: Mon Nov 16 19:46:39 2015 New Revision: 1714654 URL: http://svn.apache.org/viewvc?rev=1714654&view=rev Log: SLING-5303 : adding a few more loops to avoid a failure that happened on jenkins due to the fact that heartbeatsAndCheckView can throw exceptions when invoked during promotion/other repository changes in a test environment. More loops should help work around that.
Modified: sling/trunk/bundles/extensions/discovery/base/src/test/java/org/apache/sling/discovery/base/its/AbstractClusterTest.java Modified: sling/trunk/bundles/extensions/discovery/base/src/test/java/org/apache/sling/discovery/base/its/AbstractClusterTest.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/base/src/test/java/org/apache/sling/discovery/base/its/AbstractClusterTest.java?rev=1714654&r1=1714653&r2=1714654&view=diff ============================================================================== --- sling/trunk/bundles/extensions/discovery/base/src/test/java/org/apache/sling/discovery/base/its/AbstractClusterTest.java (original) +++ sling/trunk/bundles/extensions/discovery/base/src/test/java/org/apache/sling/discovery/base/its/AbstractClusterTest.java Mon Nov 16 19:46:39 2015 @@ -1305,16 +1305,14 @@ public abstract class AbstractClusterTes instance3 = newBuilder().setDebugName("thirdInstance") .useRepositoryOf(instance1) .build(); - instance1.heartbeatsAndCheckView(); - instance2.heartbeatsAndCheckView(); - instance3.heartbeatsAndCheckView(); - logger.info("testAdditionalInstance: 3rd 2s sleep"); - Thread.sleep(2000); - instance1.heartbeatsAndCheckView(); - instance2.heartbeatsAndCheckView(); - instance3.heartbeatsAndCheckView(); - logger.info("testAdditionalInstance: 4th 2s sleep"); - Thread.sleep(3000); + for(int i=0; i<4; i++) { + instance1.heartbeatsAndCheckView(); + instance2.heartbeatsAndCheckView(); + instance3.heartbeatsAndCheckView(); + logger.info("testAdditionalInstance: i="+i+", 2s sleep"); + Thread.sleep(2000); + } + assertEquals(1, acceptsMultiple.getEventCnt(Type.TOPOLOGY_CHANGING)); assertEquals(1, acceptsMultiple.getEventCnt(Type.TOPOLOGY_CHANGED)); logger.info("testAdditionalInstance: end");