diff options
| author | Hunor Csomortáni <csomh@redhat.com> | 2019-07-04 14:24:09 +0200 |
|---|---|---|
| committer | Hunor Csomortáni <csomh@redhat.com> | 2019-07-16 06:15:28 +0200 |
| commit | 3e53bfe36e385f6d85b10d1eadab0a249f580f97 (patch) | |
| tree | 290cb9b711e1a4e72556f25adc277bc13f1555c7 /test/e2e/run_test.go | |
| parent | 51c00eae8b22356e72c84601e8c4f88b739755c7 (diff) | |
| download | podman-3e53bfe36e385f6d85b10d1eadab0a249f580f97.tar.gz podman-3e53bfe36e385f6d85b10d1eadab0a249f580f97.tar.bz2 podman-3e53bfe36e385f6d85b10d1eadab0a249f580f97.zip | |
Make the healthcheck flags compatible with Docker CLI
Docker CLI calls the healthcheck flags "--health-*", instead of
"--healthcheck-*".
Introduce the former, in order to keep compatibility, and alias
the later, in order to avoid breaking current usage.
Change "--healthcheck-*" to "--health-*" in the docs and tests.
Signed-off-by: Hunor Csomortáni <csomh@redhat.com>
Diffstat (limited to 'test/e2e/run_test.go')
| -rw-r--r-- | test/e2e/run_test.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go index 886e3e7a9..e35c84f5b 100644 --- a/test/e2e/run_test.go +++ b/test/e2e/run_test.go @@ -750,21 +750,21 @@ USER mail` }) It("podman run with bad healthcheck retries", func() { - session := podmanTest.Podman([]string{"run", "-dt", "--healthcheck-command", "[\"foo\"]", "--healthcheck-retries", "0", ALPINE, "top"}) + session := podmanTest.Podman([]string{"run", "-dt", "--health-cmd", "[\"foo\"]", "--health-retries", "0", ALPINE, "top"}) session.Wait() Expect(session.ExitCode()).ToNot(Equal(0)) Expect(session.ErrorToString()).To(ContainSubstring("healthcheck-retries must be greater than 0")) }) It("podman run with bad healthcheck timeout", func() { - session := podmanTest.Podman([]string{"run", "-dt", "--healthcheck-command", "[\"foo\"]", "--healthcheck-timeout", "0s", ALPINE, "top"}) + session := podmanTest.Podman([]string{"run", "-dt", "--health-cmd", "[\"foo\"]", "--health-timeout", "0s", ALPINE, "top"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).ToNot(Equal(0)) Expect(session.ErrorToString()).To(ContainSubstring("healthcheck-timeout must be at least 1 second")) }) It("podman run with bad healthcheck start-period", func() { - session := podmanTest.Podman([]string{"run", "-dt", "--healthcheck-command", "[\"foo\"]", "--healthcheck-start-period", "-1s", ALPINE, "top"}) + session := podmanTest.Podman([]string{"run", "-dt", "--health-cmd", "[\"foo\"]", "--health-start-period", "-1s", ALPINE, "top"}) session.WaitWithDefaultTimeout() Expect(session.ExitCode()).ToNot(Equal(0)) Expect(session.ErrorToString()).To(ContainSubstring("healthcheck-start-period must be 0 seconds or greater")) |