arangodb
diff --git a/‎tests/js/server/resilience/failover-view/resilience-synchronous-repl-with-arangosearch-view-cluster.js
Lines changed: 11 additions & 4 deletions b/‎tests/js/server/resilience/failover-view/resilience-synchronous-repl-with-arangosearch-view-cluster.js
Lines changed: 11 additions & 4 deletions
@@ -58,6 +58,7 @@ function SynchronousReplicationWithViewSuite () {
   var cinfo;
   var ccinfo;
   var shards;
+  var failedState = { leader: null, follower: null };
 
 /// @brief find out servers for the system collections
@@ -120,21 +121,23 @@ function SynchronousReplicationWithViewSuite () {
     assertTrue(pos >= 0);
     assertTrue(suspendExternal(global.instanceInfo.arangods[pos].pid));
     console.info("Have failed follower", follower);
+    failedState.follower = follower;
   }
 
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief heal the follower
 ////////////////////////////////////////////////////////////////////////////////
 
-  function healFollower() {
-    var follower = cinfo.shards[shards[0]][1];
+  function healFollower(follower = null) {
+    if (follower == null) follower = cinfo.shards[shards[0]][1];
     var endpoint = global.ArangoClusterInfo.getServerEndpoint(follower);
     // Now look for instanceInfo:
     var pos = _.findIndex(global.instanceInfo.arangods,
                           x => x.endpoint === endpoint);
     assertTrue(pos >= 0);
     assertTrue(continueExternal(global.instanceInfo.arangods[pos].pid));
     console.info("Have healed follower", follower);
+    if (failedState.follower === follower) failedState.follower = null;
   }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -150,22 +153,24 @@ function SynchronousReplicationWithViewSuite () {
     assertTrue(pos >= 0);
     assertTrue(suspendExternal(global.instanceInfo.arangods[pos].pid));
     console.info("Have failed leader", leader);
+    failedState.leader = leader;
     return leader;
   }
 
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief heal the follower
 ////////////////////////////////////////////////////////////////////////////////
 
-  function healLeader() {
-    var leader = cinfo.shards[shards[0]][0];
+  function healLeader(leader) {
+    if (leader == null) leader = cinfo.shards[shards[0]][1];
     var endpoint = global.ArangoClusterInfo.getServerEndpoint(leader);
     // Now look for instanceInfo:
     var pos = _.findIndex(global.instanceInfo.arangods,
                           x => x.endpoint === endpoint);
     assertTrue(pos >= 0);
     assertTrue(continueExternal(global.instanceInfo.arangods[pos].pid));
     console.info("Have healed leader", leader);
+    if (failedState.leader === leader) failedState.leader = null;
   }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -493,6 +498,8 @@ function SynchronousReplicationWithViewSuite () {
 ////////////////////////////////////////////////////////////////////////////////
 
     tearDown : function () {
+      if(failedState.leader != null) healLeader(failedState.leader);
+      if(failedState.follower != null) healFollower(failedState.leader);
       db._drop(cn);
       viewOperations("drop");
       //global.ArangoAgency.set('Target/FailedServers', {});