diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-11-23 13:44:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-23 13:44:37 +0100 |
| commit | dd343418ce5a3fd6c6238d7e2edc132826756051 (patch) | |
| tree | 8f6f33d7e8faed4bf8201d655a54a7277282820f /test | |
| parent | ac55bd1f673156cbb60b568b65f7bf4918daf152 (diff) | |
| parent | dc8996ec84ffd6f272361edbf7c19e91c52519d9 (diff) | |
| download | podman-dd343418ce5a3fd6c6238d7e2edc132826756051.tar.gz podman-dd343418ce5a3fd6c6238d7e2edc132826756051.tar.bz2 podman-dd343418ce5a3fd6c6238d7e2edc132826756051.zip | |
Merge pull request #8263 from rhatdan/restart
Allow containers to --restart on-failure with --rm
Diffstat (limited to 'test')
| -rw-r--r-- | test/e2e/run_test.go | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go index 5ee85efb9..0d65a3e59 100644 --- a/test/e2e/run_test.go +++ b/test/e2e/run_test.go @@ -75,11 +75,9 @@ var _ = Describe("Podman run", func() { session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(Equal(0)) - // the --rm option conflicts with --restart, when the restartPolicy is not "" and "no" - // so the exitCode should not equal 0 session = podmanTest.Podman([]string{"run", "--rm", "--restart", "on-failure", ALPINE}) session.WaitWithDefaultTimeout() - Expect(session.ExitCode()).To(Not(Equal(0))) + Expect(session.ExitCode()).To(Equal(0)) session = podmanTest.Podman([]string{"run", "--rm", "--restart", "always", ALPINE}) session.WaitWithDefaultTimeout() |