summaryrefslogtreecommitdiff
path: root/test/e2e/common_test.go
diff options
context:
space:
mode:
authorbaude <bbaude@redhat.com>2019-03-27 13:50:54 -0500
committerbaude <bbaude@redhat.com>2019-04-24 16:00:04 -0500
commit7bf7c177ab3f67d5de1689842204c258fca083e4 (patch)
tree960fd1365913209fec61e3226b96a6f8bb1fd051 /test/e2e/common_test.go
parentd75543fcd2ce87a9b87b8883400f355979004e91 (diff)
downloadpodman-7bf7c177ab3f67d5de1689842204c258fca083e4.tar.gz
podman-7bf7c177ab3f67d5de1689842204c258fca083e4.tar.bz2
podman-7bf7c177ab3f67d5de1689842204c258fca083e4.zip
journald event logging
add the ability for podman to read and write events to journald instead of just a logfile. This can be controlled in libpod.conf with the `events_logger` attribute of `journald` or `file`. The default will be set to `journald`. Signed-off-by: baude <bbaude@redhat.com>
Diffstat (limited to 'test/e2e/common_test.go')
-rw-r--r--test/e2e/common_test.go6
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)