diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/e2e/system_service_test.go | 6 | ||||
| -rw-r--r-- | test/system/001-basic.bats | 8 | ||||
| -rw-r--r-- | test/system/035-logs.bats | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/test/e2e/system_service_test.go b/test/e2e/system_service_test.go index 9a4d687c3..922a8c423 100644 --- a/test/e2e/system_service_test.go +++ b/test/e2e/system_service_test.go @@ -45,8 +45,6 @@ var _ = Describe("podman system service", func() { defer session.Kill() WaitForService(address) - - session.Wait(5 * time.Second) Eventually(session, 5).Should(Exit(0)) }) }) @@ -91,7 +89,7 @@ var _ = Describe("podman system service", func() { Expect(body).ShouldNot(BeEmpty()) session.Interrupt().Wait(2 * time.Second) - Eventually(session).Should(Exit(1)) + Eventually(session, 5).Should(Exit(1)) }) It("are not available", func() { @@ -113,7 +111,7 @@ var _ = Describe("podman system service", func() { Expect(session.Err.Contents()).ShouldNot(ContainSubstring(magicComment)) session.Interrupt().Wait(2 * time.Second) - Eventually(session).Should(Exit(1)) + Eventually(session, 5).Should(Exit(1)) }) }) }) diff --git a/test/system/001-basic.bats b/test/system/001-basic.bats index 03f07d602..23489c1b5 100644 --- a/test/system/001-basic.bats +++ b/test/system/001-basic.bats @@ -15,12 +15,10 @@ function setup() { @test "podman version emits reasonable output" { run_podman version - # First line of podman-remote is "Client:<blank>". + # First line of podman version is "Client: *Podman Engine". # Just delete it (i.e. remove the first entry from the 'lines' array) - if is_remote; then - if expr "${lines[0]}" : "Client:" >/dev/null; then - lines=("${lines[@]:1}") - fi + if expr "${lines[0]}" : "Client: *" >/dev/null; then + lines=("${lines[@]:1}") fi is "${lines[0]}" "Version:[ ]\+[1-9][0-9.]\+" "Version line 1" diff --git a/test/system/035-logs.bats b/test/system/035-logs.bats index 44984eaad..3caf97a22 100644 --- a/test/system/035-logs.bats +++ b/test/system/035-logs.bats @@ -91,6 +91,10 @@ ${cid[0]} d" "Sequential output from logs" function _log_test_restarted() { run_podman run --log-driver=$1 --name logtest $IMAGE sh -c 'start=0; if test -s log; then start=`tail -n 1 log`; fi; seq `expr $start + 1` `expr $start + 10` | tee -a log' + # FIXME: #9597 + # run/start is flaking for remote so let's wait for the container condition + # to stop wasting energy until the root cause gets fixed. + run_podman container wait --condition=exited logtest run_podman start -a logtest logfile=$(mktemp -p ${PODMAN_TMPDIR} logfileXXXXXXXX) $PODMAN $_PODMAN_TEST_OPTS logs -f logtest > $logfile |