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/04 14:41:07 UTC
svn commit: r1712546 -
/sling/trunk/bundles/extensions/discovery/base/src/test/java/org/apache/sling/discovery/base/its/AbstractClusterTest.java
Author: stefanegli
Date: Wed Nov 4 13:41:07 2015
New Revision: 1712546
URL: http://svn.apache.org/viewvc?rev=1712546&view=rev
Log:
SLING-5260 : made loop in testConnectorSwitching4139 last 15-20sec to cope with 10sec timeout
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=1712546&r1=1712545&r2=1712546&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 Wed Nov 4 13:41:07 2015
@@ -441,7 +441,7 @@ public abstract class AbstractClusterTes
assertTrue(pingConnector(instance3, instance2));
assertTrue(pingConnector(instance5, instance2));
success = false;
- for(int i=0; i<25; i++) {
+ for(int i=0; i<40; i++) {
runHeartbeatOnceWith(instance1Restarted, instance2, instance3, instance5);
instance1.getViewChecker().checkView();
// we used to do:
@@ -474,15 +474,16 @@ public abstract class AbstractClusterTes
final ClusterView i3Cluster = i3.getClusterView();
final int i3ClusterSize = i3Cluster.getInstances().size();
if (i3ClusterSize==1) {
- if (i<20) {
+ if (i<30) {
logger.info("testConnectorSwitching4139: [2] min loop cnt not yet reached: i="+i);
- Thread.sleep(500); // 20x500ms = 10sec max - (vs 5sec timeout) - should be enough for timing out
+ Thread.sleep(500); // 30x500ms = 15sec max - (vs 10sec timeout) - should be enough for timing out
continue;
}
success = true;
+ logger.info("testConnectorSwitching4139: i3ClusterSize: "+i3ClusterSize+", i="+i+" (success)");
break;
}
- logger.info("testConnectorSwitching4139: i3ClusterSize: "+i3ClusterSize);
+ logger.info("testConnectorSwitching4139: i3ClusterSize: "+i3ClusterSize+", i="+i);
Thread.sleep(500);
}