diff options
| -rw-r--r-- | go.mod | 2 | ||||
| -rw-r--r-- | go.sum | 3 | ||||
| -rw-r--r-- | test/e2e/system_service_test.go | 6 | ||||
| -rw-r--r-- | test/system/035-logs.bats | 4 | ||||
| -rw-r--r-- | vendor/modules.txt | 2 |
5 files changed, 10 insertions, 7 deletions
@@ -47,7 +47,7 @@ require ( github.com/onsi/gomega v1.17.0 github.com/opencontainers/go-digest v1.0.0 github.com/opencontainers/image-spec v1.0.2-0.20211123152302-43a7dee1ec31 - github.com/opencontainers/runc v1.0.2 + github.com/opencontainers/runc v1.0.3 github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 github.com/opencontainers/runtime-tools v0.9.1-0.20211020193359-09d837bf40a7 github.com/opencontainers/selinux v1.10.0 @@ -771,8 +771,9 @@ github.com/opencontainers/runc v1.0.0-rc9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rm github.com/opencontainers/runc v1.0.0-rc91/go.mod h1:3Sm6Dt7OT8z88EbdQqqcRN2oCT54jbi72tT/HqgflT8= github.com/opencontainers/runc v1.0.0-rc93/go.mod h1:3NOsor4w32B2tC0Zbl8Knk4Wg84SM2ImC1fxBuqJ/H0= github.com/opencontainers/runc v1.0.1/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0= -github.com/opencontainers/runc v1.0.2 h1:opHZMaswlyxz1OuGpBE53Dwe4/xF7EZTY0A2L/FpCOg= github.com/opencontainers/runc v1.0.2/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0= +github.com/opencontainers/runc v1.0.3 h1:1hbqejyQWCJBvtKAfdO0b1FmaEf2z/bxnjqbARass5k= +github.com/opencontainers/runc v1.0.3/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0= github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.0.1/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.0.2-0.20190207185410-29686dbc5559/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= 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/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 diff --git a/vendor/modules.txt b/vendor/modules.txt index df8cf40c8..076f93039 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -549,7 +549,7 @@ github.com/opencontainers/go-digest ## explicit github.com/opencontainers/image-spec/specs-go github.com/opencontainers/image-spec/specs-go/v1 -# github.com/opencontainers/runc v1.0.2 +# github.com/opencontainers/runc v1.0.3 ## explicit github.com/opencontainers/runc/libcontainer/apparmor github.com/opencontainers/runc/libcontainer/cgroups |