summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorBrent Baude <bbaude@redhat.com>2020-07-02 10:36:24 -0500
committerBrent Baude <bbaude@redhat.com>2020-07-02 10:36:24 -0500
commita0599b77b7ed7e723259db89174a2d115df7cdf2 (patch)
treec62925a442823945ceafbde014ced7126344f73d /test
parentc131567401bea2867d597d79cce75b99012e64fb (diff)
downloadpodman-a0599b77b7ed7e723259db89174a2d115df7cdf2.tar.gz
podman-a0599b77b7ed7e723259db89174a2d115df7cdf2.tar.bz2
podman-a0599b77b7ed7e723259db89174a2d115df7cdf2.zip
stop podman service in e2e tests
when running e2e tests, each test knows to stop its service when running remote; however, during setup and teardown remote services were not being killed when we were done with them. Signed-off-by: Brent Baude <bbaude@redhat.com>
Diffstat (limited to 'test')
-rw-r--r--test/e2e/common_test.go10
1 files changed, 10 insertions, 0 deletions
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go
index e12edad49..fd922f358 100644
--- a/test/e2e/common_test.go
+++ b/test/e2e/common_test.go
@@ -143,6 +143,12 @@ var _ = SynchronizedBeforeSuite(func() []byte {
fmt.Println(err)
os.Exit(1)
}
+
+ // If running remote, we need to stop the associated podman system service
+ if podman.RemoteTest {
+ podman.StopRemoteService()
+ }
+
return []byte(path)
}, func(data []byte) {
LockTmpDir = string(data)
@@ -173,6 +179,10 @@ var _ = SynchronizedAfterSuite(func() {},
fmt.Printf("%q\n", err)
}
+ // If running remote, we need to stop the associated podman system service
+ if podmanTest.RemoteTest {
+ podmanTest.StopRemoteService()
+ }
// for localized tests, this removes the image cache dir and for remote tests
// this is a no-op
removeCache()