Merge pull request #12805 from ptabor/20210326-minor-test-fixes

tests: logging & temp-dir fixes
This commit is contained in:
Sam Batschelet
2021-03-28 19:14:13 -04:00
committed by GitHub
19 changed files with 122 additions and 122 deletions

View File

@@ -181,18 +181,18 @@ func newEtcdProcessCluster(t testing.TB, cfg *etcdProcessClusterConfig) (*etcdPr
proc, err := newEtcdProcess(etcdCfgs[i])
if err != nil {
epc.Close()
return nil, err
return nil, fmt.Errorf("Cannot configure: %v", err)
}
epc.procs[i] = proc
}
if cfg.rollingStart {
if err := epc.RollingStart(); err != nil {
return nil, err
return nil, fmt.Errorf("Cannot rolling-start: %v", err)
}
} else {
if err := epc.Start(); err != nil {
return nil, err
return nil, fmt.Errorf("Cannot start: %v", err)
}
}
return epc, nil