Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6011 from heyitsanthony/fix-migrate-test

Browse Source 
e2e: use a single member cluster in TestCtlV3Migrate
This commit is contained in:
Anthony Romano 2016-07-20 13:27:17 -07:00 committed by GitHub
commit 65d7e7963a
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
e2e/ctl_v3_migrate_test.go
View File

@ -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)) dataDir := epc.procs[0].cfg.dataDirPath
for i := range epc.procs {
dataDirs[i] = epc.procs[i].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, dataDir, ""); err != nil {
if err := ctlV3Migrate(cx, dataDirs[i], ""); err != nil { t.Fatal(err)
t.Fatal(err)
}
} }
for i := range epc.procs { epc.procs[0].cfg.keepDataDir = true
epc.procs[i].cfg.keepDataDir = true
}
if err := epc.RestartAll(); err != nil { if err := epc.RestartAll(); err != nil {
t.Fatal(err) t.Fatal(err)
} }