functional/tester: clean up snapshot failure cases

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>

functional/tester/failure_case_sigquit_remove.go

@@ -67,7 +67,7 @@ func inject_SIGQUIT_ETCD_AND_REMOVE_DATA(clus *Cluster, idx1 int) error {
 		return err
 	}
 
-	time.Sleep(3 * time.Second)
+	time.Sleep(2 * time.Second)
 
 	idx2 := (idx1 + 1) % len(clus.Members)
 	var cli2 *clientv3.Client
@@ -89,7 +89,7 @@ func inject_SIGQUIT_ETCD_AND_REMOVE_DATA(clus *Cluster, idx1 int) error {
 		return err
 	}
 
-	time.Sleep(5 * time.Second)
+	time.Sleep(2 * time.Second)
 
 	mresp, err = cli2.MemberList(context.Background())
 	mss = []string{}
@@ -124,7 +124,7 @@ func recover_SIGQUIT_ETCD_AND_REMOVE_DATA(clus *Cluster, idx1 int) error {
 		return err
 	}
 
-	time.Sleep(3 * time.Second)
+	time.Sleep(2 * time.Second)
 
 	clus.Members[idx1].Etcd.InitialClusterState = "existing"
 	err = clus.sendOp(idx1, rpcpb.Operation_RESTART_ETCD)
@@ -137,7 +137,7 @@ func recover_SIGQUIT_ETCD_AND_REMOVE_DATA(clus *Cluster, idx1 int) error {
 		return err
 	}
 
-	time.Sleep(3 * time.Second)
+	time.Sleep(2 * time.Second)
 
 	var mresp *clientv3.MemberListResponse
 	mresp, err = cli2.MemberList(context.Background())

functional/tester/failure_case_sigterm.go

@@ -37,6 +37,13 @@ func new_FailureCase_SIGTERM_ONE_FOLLOWER(clus *Cluster) Failure {
 	}
 }
 
+func new_FailureCase_SIGTERM_ONE_FOLLOWER_UNTIL_TRIGGER_SNAPSHOT(clus *Cluster) Failure {
+	return &failureUntilSnapshot{
+		failureCase: rpcpb.FailureCase_SIGTERM_ONE_FOLLOWER_UNTIL_TRIGGER_SNAPSHOT,
+		Failure:     new_FailureCase_SIGTERM_ONE_FOLLOWER(clus),
+	}
+}
+
 func new_FailureCase_SIGTERM_LEADER(clus *Cluster) Failure {
 	ff := failureByFunc{
 		failureCase:   rpcpb.FailureCase_SIGTERM_LEADER,
@@ -50,6 +57,13 @@ func new_FailureCase_SIGTERM_LEADER(clus *Cluster) Failure {
 	}
 }
 
+func new_FailureCase_SIGTERM_LEADER_UNTIL_TRIGGER_SNAPSHOT(clus *Cluster) Failure {
+	return &failureUntilSnapshot{
+		failureCase: rpcpb.FailureCase_SIGTERM_LEADER_UNTIL_TRIGGER_SNAPSHOT,
+		Failure:     new_FailureCase_SIGTERM_LEADER(clus),
+	}
+}
+
 func new_FailureCase_SIGTERM_QUORUM(clus *Cluster) Failure {
 	f := &failureQuorum{
 		failureCase:   rpcpb.FailureCase_SIGTERM_QUORUM,
@@ -73,17 +87,3 @@ func new_FailureCase_SIGTERM_ALL(clus *Cluster) Failure {
 		delayDuration: clus.GetFailureDelayDuration(),
 	}
 }
-
-func new_FailureCase_SIGTERM_ONE_FOLLOWER_UNTIL_TRIGGER_SNAPSHOT(clus *Cluster) Failure {
-	return &failureUntilSnapshot{
-		failureCase: rpcpb.FailureCase_SIGTERM_ONE_FOLLOWER_UNTIL_TRIGGER_SNAPSHOT,
-		Failure:     new_FailureCase_SIGTERM_ONE_FOLLOWER(clus),
-	}
-}
-
-func new_FailureCase_SIGTERM_LEADER_UNTIL_TRIGGER_SNAPSHOT(clus *Cluster) Failure {
-	return &failureUntilSnapshot{
-		failureCase: rpcpb.FailureCase_SIGTERM_LEADER_UNTIL_TRIGGER_SNAPSHOT,
-		Failure:     new_FailureCase_SIGTERM_LEADER(clus),
-	}
-}