diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-04-25 12:20:39 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-25 12:20:39 -0700 |
| commit | 01e79477ca75df54836944a94eb4840c9e9f49e1 (patch) | |
| tree | 8b76672f2a4e83b0c8334132dca92e3b1279ba14 /test/e2e/common_test.go | |
| parent | e900e95f9aa6a22eeef9f78573dfb88df2f10d49 (diff) | |
| parent | 7bf7c177ab3f67d5de1689842204c258fca083e4 (diff) | |
| download | podman-01e79477ca75df54836944a94eb4840c9e9f49e1.tar.gz podman-01e79477ca75df54836944a94eb4840c9e9f49e1.tar.bz2 podman-01e79477ca75df54836944a94eb4840c9e9f49e1.zip | |
Merge pull request #2850 from baude/eventsjournald
journald event logging
Diffstat (limited to 'test/e2e/common_test.go')
| -rw-r--r-- | test/e2e/common_test.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go index a30a9b20b..a6fc211f6 100644 --- a/test/e2e/common_test.go +++ b/test/e2e/common_test.go @@ -407,9 +407,13 @@ func (p *PodmanTestIntegration) PodmanPID(args []string) (*PodmanSessionIntegrat func (p *PodmanTestIntegration) Cleanup() { // Remove all containers stopall := p.Podman([]string{"stop", "-a", "--timeout", "0"}) - // stopall.WaitWithDefaultTimeout() stopall.Wait(90) + podstop := p.Podman([]string{"pod", "stop", "-a", "-t", "0"}) + podstop.WaitWithDefaultTimeout() + podrm := p.Podman([]string{"pod", "rm", "-fa"}) + podrm.WaitWithDefaultTimeout() + session := p.Podman([]string{"rm", "-fa"}) session.Wait(90) |