containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Brent Baude 2020-07-02 10:36:24 -05:00
parent c131567401
commit a0599b77b7
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/e2e/common_test.go
View File

@ -143,6 +143,12 @@ var _ = SynchronizedBeforeSuite(func() []byte {
fmt.Println(err) fmt.Println(err)
os.Exit(1) os.Exit(1)
} }
// If running remote, we need to stop the associated podman system service
if podman.RemoteTest {
podman.StopRemoteService()
}
return []byte(path) return []byte(path)
}, func(data []byte) { }, func(data []byte) {
LockTmpDir = string(data) LockTmpDir = string(data)
@ -173,6 +179,10 @@ var _ = SynchronizedAfterSuite(func() {},
fmt.Printf("%q\n", err) 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 // for localized tests, this removes the image cache dir and for remote tests
// this is a no-op // this is a no-op
removeCache() removeCache()