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 #14999 from fuweid/deflake-14926

Browse Source 
e2e: deflake TestCtlV3AuthGracefulDisable
This commit is contained in:
Benjamin Wang 2022-12-16 14:42:27 +08:00 committed by GitHub
commit 5879ee9bd2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/framework/e2e/cluster_proxy.go
View File

@ -159,10 +159,21 @@ func (pp *proxyProc) Stop() error {
if pp.proc == nil { if pp.proc == nil {
return nil return nil
} }
if err := pp.proc.Stop(); err != nil && !strings.Contains(err.Error(), "exit status 1") { err := pp.proc.Stop()
// v2proxy exits with status 1 on auto tls; not sure why if err != nil {
return err return err
} }
err = pp.proc.Close()
if err != nil {
// proxy received SIGTERM signal
if !(strings.Contains(err.Error(), "unexpected exit code") ||
// v2proxy exits with status 1 on auto tls; not sure why
strings.Contains(err.Error(), "exit status 1")) {
return err
}
}
pp.proc = nil pp.proc = nil
<-pp.donec <-pp.donec
pp.donec = make(chan struct{}) pp.donec = make(chan struct{})