Browse Source

e2e: use a single member cluster in TestCtlV3Migrate

Occasionally migrate would fail because a minority node would be missing
v2 keys. Instead, just use a single member cluster.

Fixes #5992
Anthony Romano 9 years ago
parent
commit
a289bf58e6
1 changed files with 5 additions and 13 deletions
  1. 5 13
      e2e/ctl_v3_migrate_test.go

+ 5 - 13
e2e/ctl_v3_migrate_test.go

@@ -29,7 +29,7 @@ import (
 func TestCtlV3Migrate(t *testing.T) {
 func TestCtlV3Migrate(t *testing.T) {
 	defer testutil.AfterTest(t)
 	defer testutil.AfterTest(t)
 
 
-	epc := setupEtcdctlTest(t, &configNoTLS, true)
+	epc := setupEtcdctlTest(t, &configNoTLS, false)
 	defer func() {
 	defer func() {
 		if errC := epc.Close(); errC != nil {
 		if errC := epc.Close(); errC != nil {
 			t.Fatalf("error closing etcd processes (%v)", errC)
 			t.Fatalf("error closing etcd processes (%v)", errC)
@@ -48,10 +48,7 @@ func TestCtlV3Migrate(t *testing.T) {
 		}
 		}
 	}
 	}
 
 
-	dataDirs := make([]string, len(epc.procs))
-	for i := range epc.procs {
-		dataDirs[i] = epc.procs[i].cfg.dataDirPath
-	}
+	dataDir := epc.procs[0].cfg.dataDirPath
 	if err := epc.StopAll(); err != nil {
 	if err := epc.StopAll(); err != nil {
 		t.Fatalf("error closing etcd processes (%v)", err)
 		t.Fatalf("error closing etcd processes (%v)", err)
 	}
 	}
@@ -62,18 +59,13 @@ func TestCtlV3Migrate(t *testing.T) {
 		t:           t,
 		t:           t,
 		cfg:         configNoTLS,
 		cfg:         configNoTLS,
 		dialTimeout: 7 * time.Second,
 		dialTimeout: 7 * time.Second,
-		quorum:      true,
 		epc:         epc,
 		epc:         epc,
 	}
 	}
-	for i := range dataDirs {
-		if err := ctlV3Migrate(cx, dataDirs[i], ""); err != nil {
-			t.Fatal(err)
-		}
+	if err := ctlV3Migrate(cx, dataDir, ""); err != nil {
+		t.Fatal(err)
 	}
 	}
 
 
-	for i := range epc.procs {
-		epc.procs[i].cfg.keepDataDir = true
-	}
+	epc.procs[0].cfg.keepDataDir = true
 	if err := epc.RestartAll(); err != nil {
 	if err := epc.RestartAll(); err != nil {
 		t.Fatal(err)
 		t.Fatal(err)
 	}
 	}