diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-09-20 14:21:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-20 14:21:44 -0400 |
| commit | 791458605af79e17e12a5a56fff30742ea0ff310 (patch) | |
| tree | eb056166911b641c6c230023cb7cbf19697fa3eb /test | |
| parent | fff178fe517406f61fc6ddad00312ee7282e0174 (diff) | |
| parent | b74edfb0a1bf5a27a3bba884a0e2275d2f281a65 (diff) | |
| download | podman-791458605af79e17e12a5a56fff30742ea0ff310.tar.gz podman-791458605af79e17e12a5a56fff30742ea0ff310.tar.bz2 podman-791458605af79e17e12a5a56fff30742ea0ff310.zip | |
Merge pull request #11630 from rhatdan/timeout
Add support for retrieving system service --timeout
Diffstat (limited to 'test')
| -rw-r--r-- | test/e2e/config/containers.conf | 1 | ||||
| -rw-r--r-- | test/e2e/containers_conf_test.go | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/test/e2e/config/containers.conf b/test/e2e/config/containers.conf index bbd712254..c33f32ab4 100644 --- a/test/e2e/config/containers.conf +++ b/test/e2e/config/containers.conf @@ -59,6 +59,7 @@ no_hosts=true [engine] network_cmd_options=["allow_host_loopback=true"] +service_timeout=1234 # We need to ensure each test runs on a separate plugin instance... # For now, let's just make a bunch of plugin paths and have each test use one. diff --git a/test/e2e/containers_conf_test.go b/test/e2e/containers_conf_test.go index f5e85e723..fac200c3c 100644 --- a/test/e2e/containers_conf_test.go +++ b/test/e2e/containers_conf_test.go @@ -444,4 +444,12 @@ var _ = Describe("Podman run", func() { Expect(session).Should(Exit(0)) Expect(session.ErrorToString()).To(ContainSubstring("invalid image_copy_tmp_dir")) }) + + It("podman system sevice --help shows (default 20)", func() { + SkipIfRemote("this test is only for local") + result := podmanTest.Podman([]string{"system", "service", "--help"}) + result.WaitWithDefaultTimeout() + Expect(result).Should(Exit(0)) + Expect(result.OutputToString()).To(ContainSubstring("(default 1234)")) + }) }) |