Skip to content

Commit

Permalink
[3.5]backport: pkg/expect: avoid hardcoding when checking ErrProcessDone
Browse files Browse the repository at this point in the history
ExpectProcess's Stop method uses 'strings.Contains' to check
the returned err, however, this can be avoided. os.ErrProcessDone's
error message is the same as the hardcoded string. So I think
this explicit error is what this method wants to compare.

Signed-off-by: Jes Cok <[email protected]>
  • Loading branch information
callthingsoff authored and ArkaSaha30 committed May 23, 2024
1 parent 0bcdc34 commit d9615e2
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkg/expect/expect.go
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ func (ep *ExpectProcess) ExitError() error {
// Stop signals the process to terminate via SIGTERM
func (ep *ExpectProcess) Stop() error {
err := ep.Signal(syscall.SIGTERM)
if err != nil && strings.Contains(err.Error(), "os: process already finished") {
if err != nil && errors.Is(err, os.ErrProcessDone) {
return nil
}
return err
Expand Down

0 comments on commit d9615e2

Please sign in to comment.