summaryrefslogtreecommitdiff
path: root/test/e2e/run_cleanup_test.go
diff options
context:
space:
mode:
authorChris Evich <cevich@redhat.com>2019-02-28 09:38:02 -0500
committerChris Evich <cevich@redhat.com>2019-03-01 09:18:45 -0500
commitf67859ffb396be13cb8c4b8d91343b77de4eb288 (patch)
tree44a2ef27d992198f2ce0d9a6e0f0ec6a07c0008f /test/e2e/run_cleanup_test.go
parente30628eeda9898a64c0a5ed541536d8d5a3cf13c (diff)
downloadpodman-f67859ffb396be13cb8c4b8d91343b77de4eb288.tar.gz
podman-f67859ffb396be13cb8c4b8d91343b77de4eb288.tar.bz2
podman-f67859ffb396be13cb8c4b8d91343b77de4eb288.zip
Fix SystemExec completion race
Some callers assume when SystemExec returns, the command has completed. Other callers explicitly wait for completion (as required). However, forgetting to do that is an incredibly easy mistake to make. Fix this by adding an explicit parameter to the function. This requires every caller to deliberately state whether or not a completion-check is required. Also address **many** resource naming / cleanup completion-races. Signed-off-by: Chris Evich <cevich@redhat.com>
Diffstat (limited to 'test/e2e/run_cleanup_test.go')
-rw-r--r--test/e2e/run_cleanup_test.go6
1 files changed, 4 insertions, 2 deletions
diff --git a/test/e2e/run_cleanup_test.go b/test/e2e/run_cleanup_test.go
index aa823b4e6..1f2a4085d 100644
--- a/test/e2e/run_cleanup_test.go
+++ b/test/e2e/run_cleanup_test.go
@@ -36,14 +36,16 @@ var _ = Describe("Podman run exit", func() {
It("podman run -d mount cleanup test", func() {
mount := SystemExec("mount", nil)
- mount.WaitWithDefaultTimeout()
+ Expect(mount.ExitCode()).To(Equal(0))
+
out1 := mount.OutputToString()
result := podmanTest.Podman([]string{"create", "-dt", ALPINE, "echo", "hello"})
result.WaitWithDefaultTimeout()
Expect(result.ExitCode()).To(Equal(0))
mount = SystemExec("mount", nil)
- mount.WaitWithDefaultTimeout()
+ Expect(mount.ExitCode()).To(Equal(0))
+
out2 := mount.OutputToString()
Expect(out1).To(Equal(out2))
})