Browse Source

Merge pull request #10390 from johncming/missing-err

tests/e2e: add missing return error.
Xiang Li 7 years ago
parent
commit
fae6e92407
1 changed files with 7 additions and 3 deletions
  1. 7 3
      tests/e2e/etcd_process.go

+ 7 - 3
tests/e2e/etcd_process.go

@@ -104,18 +104,22 @@ func (ep *etcdServerProcess) Restart() error {
 	return ep.Start()
 }
 
-func (ep *etcdServerProcess) Stop() error {
+func (ep *etcdServerProcess) Stop() (err error) {
 	if ep == nil || ep.proc == nil {
 		return nil
 	}
-	if err := ep.proc.Stop(); err != nil {
+	err = ep.proc.Stop()
+	if err != nil {
 		return err
 	}
 	ep.proc = nil
 	<-ep.donec
 	ep.donec = make(chan struct{})
 	if ep.cfg.purl.Scheme == "unix" || ep.cfg.purl.Scheme == "unixs" {
-		os.Remove(ep.cfg.purl.Host + ep.cfg.purl.Path)
+		err = os.Remove(ep.cfg.purl.Host + ep.cfg.purl.Path)
+		if err != nil {
+			return err
+		}
 	}
 	return nil
 }