Browse Source

fix(test/remove_node_test.go) fix a deadlock in the test

The go-etcd client waits for the response from the paused node. And the test waits for the reponse to continue.
Actually we do not even need that small test, since we will check the machine status afterwards.
Xiang Li 11 years ago
parent
commit
aaedf32c04
1 changed files with 1 additions and 13 deletions
  1. 1 13
      tests/functional/remove_node_test.go

+ 1 - 13
tests/functional/remove_node_test.go

@@ -185,20 +185,8 @@ func TestRemovePausedNode(t *testing.T) {
 
 
 		etcds[idx].Signal(syscall.SIGSTOP)
 		etcds[idx].Signal(syscall.SIGSTOP)
 		fmt.Printf("pause node%d and let standby node take its place\n", idx+1)
 		fmt.Printf("pause node%d and let standby node take its place\n", idx+1)
-		time.Sleep(4 * time.Second)
 
 
-		resp, err := c.Get("_etcd/machines", false, false)
-		if err != nil {
-			panic(err)
-		}
-		if len(resp.Node.Nodes) != 3 {
-			t.Fatal("cannot remove peer")
-		}
-		for i := 0; i < 3; i++ {
-			if resp.Node.Nodes[i].Key == fmt.Sprintf("node%d", idx+1) {
-				t.Fatal("node should be removed")
-			}
-		}
+		time.Sleep(4 * time.Second)
 
 
 		etcds[idx].Signal(syscall.SIGCONT)
 		etcds[idx].Signal(syscall.SIGCONT)
 		// let it change its state to candidate at least
 		// let it change its state to candidate at least