summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-07-02 12:57:20 -0400
committerGitHub <noreply@github.com>2020-07-02 12:57:20 -0400
commitbd2fca06090f8138b4f770b753adc05c28912d6f (patch)
treee6be7649d5f7f619c6ad2d7201fad44b3447d60e
parent22def2e2d98fd2ac4f6709bd094ee66bda9c648b (diff)
parenta0599b77b7ed7e723259db89174a2d115df7cdf2 (diff)
downloadpodman-bd2fca06090f8138b4f770b753adc05c28912d6f.tar.gz
podman-bd2fca06090f8138b4f770b753adc05c28912d6f.tar.bz2
podman-bd2fca06090f8138b4f770b753adc05c28912d6f.zip
Merge pull request #6845 from baude/v2remotetests
stop podman service in e2e tests
-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()