Browse Source

e2e: skip when 'etcdProcess' is nil

Gyu-Ho Lee 9 years ago
parent
commit
5c51c600aa
1 changed files with 5 additions and 0 deletions
  1. 5 0
      e2e/etcd_test.go

+ 5 - 0
e2e/etcd_test.go

@@ -424,6 +424,11 @@ func (epc *etcdProcessCluster) StopAll() (err error) {
 func (epc *etcdProcessCluster) Close() error {
 func (epc *etcdProcessCluster) Close() error {
 	err := epc.StopAll()
 	err := epc.StopAll()
 	for _, p := range epc.procs {
 	for _, p := range epc.procs {
+		// p is nil when newEtcdProcess fails in the middle
+		// Close still gets called to clean up test data
+		if p == nil {
+			continue
+		}
 		os.RemoveAll(p.cfg.dataDirPath)
 		os.RemoveAll(p.cfg.dataDirPath)
 	}
 	}
 	return err
 	return err