From a700bc74a8094c6bcb310aab7b4494d880c5de6c Mon Sep 17 00:00:00 2001
From: antirez <antirez@gmail.com>
Date: Fri, 23 May 2014 11:40:25 +0200
Subject: [PATCH] Cluster test: more reliable 01-faildet unit.

Do things in a sequence that prevents failover during failure detection.
---
 tests/cluster/tests/01-faildet.tcl | 32 ++++++++++++++++++------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/tests/cluster/tests/01-faildet.tcl b/tests/cluster/tests/01-faildet.tcl
index a31f7eb6..8fe87c91 100644
--- a/tests/cluster/tests/01-faildet.tcl
+++ b/tests/cluster/tests/01-faildet.tcl
@@ -6,19 +6,7 @@ test "Create a 5 nodes cluster" {
     create_cluster 5 5
 }
 
-test "Killing one master node" {
-    kill_instance redis 0
-}
-
-test "Cluster should be down now" {
-    assert_cluster_state fail
-}
-
-test "Restarting master node" {
-    restart_instance redis 0
-}
-
-test "Cluster should be up again" {
+test "Cluster should start ok" {
     assert_cluster_state ok
 }
 
@@ -30,3 +18,21 @@ test "Killing two slave nodes" {
 test "Cluster should be still up" {
     assert_cluster_state ok
 }
+
+test "Killing one master node" {
+    kill_instance redis 0
+}
+
+# Note: the only slave of instance 0 is already down so no
+# failover is possible, that would change the state back to ok.
+test "Cluster should be down now" {
+    assert_cluster_state fail
+}
+
+test "Restarting master node" {
+    restart_instance redis 0
+}
+
+test "Cluster should be up again" {
+    assert_cluster_state ok
+}