diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2021-05-25 06:15:32 -0400 |
|---|---|---|
| committer | Matthew Heon <mheon@redhat.com> | 2021-05-25 15:27:57 -0400 |
| commit | 6c9de93823344fc33f6bf1be1039ce7654a5422f (patch) | |
| tree | daf989b5e603ab9da1fdb5594a78a18b5ccf7162 /test | |
| parent | 69bae4774bc8bb25943f3eeb12684d6e581809fe (diff) | |
| download | podman-6c9de93823344fc33f6bf1be1039ce7654a5422f.tar.gz podman-6c9de93823344fc33f6bf1be1039ce7654a5422f.tar.bz2 podman-6c9de93823344fc33f6bf1be1039ce7654a5422f.zip | |
Fix race condition in running ls container in a pod
All of the tests has an assumption that RunLsContainer and RunLsContainerInPod completes
the container before returning. But since the container is running
in back ground mode, the container could be still running before tools
attempt to remove it. Removing the "-d" from the command fixes the
container to match the assumption.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'test')
| -rw-r--r-- | test/e2e/common_test.go | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go index 359345096..7ffee961c 100644 --- a/test/e2e/common_test.go +++ b/test/e2e/common_test.go @@ -408,7 +408,14 @@ func (p *PodmanTestIntegration) RunLsContainer(name string) (*PodmanSessionInteg podmanArgs = append(podmanArgs, "-d", ALPINE, "ls") session := p.Podman(podmanArgs) session.WaitWithDefaultTimeout() - return session, session.ExitCode(), session.OutputToString() + if session.ExitCode() != 0 { + return session, session.ExitCode(), session.OutputToString() + } + cid := session.OutputToString() + + wsession := p.Podman([]string{"wait", cid}) + wsession.WaitWithDefaultTimeout() + return session, wsession.ExitCode(), cid } // RunNginxWithHealthCheck runs the alpine nginx container with an optional name and adds a healthcheck into it @@ -431,7 +438,14 @@ func (p *PodmanTestIntegration) RunLsContainerInPod(name, pod string) (*PodmanSe podmanArgs = append(podmanArgs, "-d", ALPINE, "ls") session := p.Podman(podmanArgs) session.WaitWithDefaultTimeout() - return session, session.ExitCode(), session.OutputToString() + if session.ExitCode() != 0 { + return session, session.ExitCode(), session.OutputToString() + } + cid := session.OutputToString() + + wsession := p.Podman([]string{"wait", cid}) + wsession.WaitWithDefaultTimeout() + return session, wsession.ExitCode(), cid } // BuildImage uses podman build and buildah to build an image |