summaryrefslogtreecommitdiff
path: root/test/e2e/load_test.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-03-01 08:43:25 -0800
committerGitHub <noreply@github.com>2019-03-01 08:43:25 -0800
commit55f80719a6b73c23c579bd4cc68cd8c382e7f860 (patch)
tree3c949283191697f7ef0557649140ca4a1c9c9034 /test/e2e/load_test.go
parentc80416f0346200c7906cfc16c6101594653a0ad6 (diff)
parentf67859ffb396be13cb8c4b8d91343b77de4eb288 (diff)
downloadpodman-55f80719a6b73c23c579bd4cc68cd8c382e7f860.tar.gz
podman-55f80719a6b73c23c579bd4cc68cd8c382e7f860.tar.bz2
podman-55f80719a6b73c23c579bd4cc68cd8c382e7f860.zip
Merge pull request #2481 from cevich/sysexec_waitcomplete
Fix SystemExec completion race
Diffstat (limited to 'test/e2e/load_test.go')
-rw-r--r--test/e2e/load_test.go4
1 files changed, 1 insertions, 3 deletions
diff --git a/test/e2e/load_test.go b/test/e2e/load_test.go
index c85810454..571754347 100644
--- a/test/e2e/load_test.go
+++ b/test/e2e/load_test.go
@@ -59,7 +59,7 @@ var _ = Describe("Podman load", func() {
Expect(save.ExitCode()).To(Equal(0))
compress := SystemExec("gzip", []string{outfile})
- compress.WaitWithDefaultTimeout()
+ Expect(compress.ExitCode()).To(Equal(0))
outfile = outfile + ".gz"
rmi := podmanTest.Podman([]string{"rmi", ALPINE})
@@ -174,7 +174,6 @@ var _ = Describe("Podman load", func() {
It("podman load localhost registry from scratch", func() {
outfile := filepath.Join(podmanTest.TempDir, "load_test.tar.gz")
-
setup := podmanTest.Podman([]string{"tag", ALPINE, "hello:world"})
setup.WaitWithDefaultTimeout()
Expect(setup.ExitCode()).To(Equal(0))
@@ -255,7 +254,6 @@ var _ = Describe("Podman load", func() {
save.WaitWithDefaultTimeout()
Expect(save.ExitCode()).To(Equal(0))
session := SystemExec("xz", []string{outfile})
- session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
rmi := podmanTest.Podman([]string{"rmi", BB})