Skip to content

Commit

Permalink
e2e: deflake TestCtlV3AuthGracefulDisable
Browse files Browse the repository at this point in the history
We should call Wait for grpc-proxy process stop before start. Otherwise,
the tcp port won't be released.

Fixes: etcd-io#14926

Signed-off-by: Wei Fu <fuweid89@gmail.com>
  • Loading branch information
fuweid committed Dec 15, 2022
1 parent 677b07b commit daf21b7
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion tests/framework/e2e/cluster_proxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,13 @@ func (pp *proxyProc) Stop() error {
if pp.proc == nil {
return nil
}
if err := pp.proc.Stop(); err != nil && !strings.Contains(err.Error(), "exit status 1") {
err := pp.proc.Stop()
if err != nil {
return err
}

err = pp.proc.Close()
if err != nil && !strings.Contains(err.Error(), "exit status 1") {
// v2proxy exits with status 1 on auto tls; not sure why
return err
}
Expand Down

0 comments on commit daf21b7

Please sign in to comment.