diff options
| author | W. Trevor King <wking@tremily.us> | 2018-05-31 17:17:59 -0700 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-06-01 08:28:06 +0000 |
| commit | 34886a79d63a0f43500bb9f56c32651d8a0de39a (patch) | |
| tree | cf76329b2085224ca09a672cebaeae86d35eedd3 /pkg/hooks/exec | |
| parent | a9e9fd4f5b56f0dd91944b86feba9a2d3814d93e (diff) | |
| download | podman-34886a79d63a0f43500bb9f56c32651d8a0de39a.tar.gz podman-34886a79d63a0f43500bb9f56c32651d8a0de39a.tar.bz2 podman-34886a79d63a0f43500bb9f56c32651d8a0de39a.zip | |
hooks/exec: Allow successful reaps for 0s post-kill timeouts
I'd been getting the failed-to-reap errors locally, but on an
unrelated pull-request the FAH27 suite successfully reaped that hook
[1]:
--- FAIL: TestRunKillTimeout (0.50s)
assertions.go:226:
Error Trace: exec_test.go:210
Error: Expect "signal: killed" to match "^failed to reap process within 0s of the kill signal$"
FAIL
The successful-reap cases limit our coverage, but I don't think that's
a big enough problem to be worth repeated polling or similar until we
do get the failed-to-reap error.
[1]: https://s3.amazonaws.com/aos-ci/ghprb/projectatomic/libpod/96c1535fdc11b2de24421863d7ad5d3b94338b37.0.1527811547665239762/output.log
Signed-off-by: W. Trevor King <wking@tremily.us>
Closes: #868
Approved by: rhatdan
Diffstat (limited to 'pkg/hooks/exec')
| -rw-r--r-- | pkg/hooks/exec/exec_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/hooks/exec/exec_test.go b/pkg/hooks/exec/exec_test.go index 433f953df..62e45ff3a 100644 --- a/pkg/hooks/exec/exec_test.go +++ b/pkg/hooks/exec/exec_test.go @@ -207,7 +207,7 @@ func TestRunKillTimeout(t *testing.T) { } hookErr, err := Run(ctx, hook, []byte("{}"), nil, nil, time.Duration(0)) assert.Equal(t, context.DeadlineExceeded, err) - assert.Regexp(t, "^failed to reap process within 0s of the kill signal$", hookErr) + assert.Regexp(t, "^(failed to reap process within 0s of the kill signal|signal: killed)$", hookErr) } func init() { |