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/09/24 14:28:58 UTC
svn commit: r1705047 -
/sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/common/heartbeat/HeartbeatTest.java
Author: stefanegli
Date: Thu Sep 24 12:28:58 2015
New Revision: 1705047
URL: http://svn.apache.org/viewvc?rev=1705047&view=rev
Log:
SLING-5030 related : fixing testPartitioningWithFailingScheduler test failure where the fast instances would time out after 10sec and notice being isolated thus reset the leaderElectionId thus put themselves at the end of the leader ordering - which is not what the test wants to achieve
Modified:
sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/common/heartbeat/HeartbeatTest.java
Modified: sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/common/heartbeat/HeartbeatTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/common/heartbeat/HeartbeatTest.java?rev=1705047&r1=1705046&r2=1705047&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/common/heartbeat/HeartbeatTest.java (original)
+++ sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/common/heartbeat/HeartbeatTest.java Thu Sep 24 12:28:58 2015
@@ -222,7 +222,7 @@ public class HeartbeatTest {
}
// so the fast listeners should only see 4 instances remaining
- for(int i=0; i<5; i++) {
+ for(int i=0; i<7; i++) {
Thread.sleep(2000);
assertEquals(TopologyEvent.Type.TOPOLOGY_CHANGED, fastListener1.getLastEvent().getType());
assertEquals(4, fastListener1.getLastEvent().getNewView().getInstances().size());
@@ -259,6 +259,16 @@ public class HeartbeatTest {
assertNotNull(slowTopo);
assertFalse(slowTopo.isCurrent());
assertEquals(5, slowTopo.getInstances().size());
+ if (!scheduler) {
+ fastMachine1.getHeartbeatHandler().issueHeartbeat();
+ fastMachine1.getHeartbeatHandler().checkView();
+ fastMachine2.getHeartbeatHandler().issueHeartbeat();
+ fastMachine2.getHeartbeatHandler().checkView();
+ fastMachine3.getHeartbeatHandler().issueHeartbeat();
+ fastMachine3.getHeartbeatHandler().checkView();
+ fastMachine4.getHeartbeatHandler().issueHeartbeat();
+ fastMachine4.getHeartbeatHandler().checkView();
+ }
}
for(int i=0; i<4; i++) {