vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tests/e2e: add missing return error.

release-3.4
johncming 2019-01-09 11:39:08 +08:00
parent 1e42503bea
commit fffb982f1a
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/e2e/etcd_process.go
View File

@ -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
}