diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-02-28 20:31:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-28 20:31:57 +0100 |
| commit | 275e9b855dd0a384a283174912c08f3f097101b5 (patch) | |
| tree | d4033df5267c5913d644608934a0f7516c8a1805 /pkg | |
| parent | 742093c2f27d79a76dbc45335e6f9458decff567 (diff) | |
| parent | e95c493fec5cab6e487d73649641cec0c1567d2c (diff) | |
| download | podman-275e9b855dd0a384a283174912c08f3f097101b5.tar.gz podman-275e9b855dd0a384a283174912c08f3f097101b5.tar.bz2 podman-275e9b855dd0a384a283174912c08f3f097101b5.zip | |
Merge pull request #5342 from cevich/runc_in_f30
Force using runc in F30
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/bindings/test/common_test.go | 4 | ||||
| -rw-r--r-- | pkg/bindings/test/containers_test.go | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pkg/bindings/test/common_test.go b/pkg/bindings/test/common_test.go index 38f5014ca..1fc774074 100644 --- a/pkg/bindings/test/common_test.go +++ b/pkg/bindings/test/common_test.go @@ -240,3 +240,7 @@ func createCache() { } b.cleanup() } + +func isStopped(state string) bool { + return state == "exited" || state == "stopped" +} diff --git a/pkg/bindings/test/containers_test.go b/pkg/bindings/test/containers_test.go index 6756e81c7..5a0bdebe6 100644 --- a/pkg/bindings/test/containers_test.go +++ b/pkg/bindings/test/containers_test.go @@ -232,7 +232,7 @@ var _ = Describe("Podman containers ", func() { // Ensure container is stopped data, err := containers.Inspect(connText, name, nil) Expect(err).To(BeNil()) - Expect(data.State.Status).To(Equal("exited")) + Expect(isStopped(data.State.Status)).To(BeTrue()) }) It("podman stop a running container by ID", func() { @@ -247,7 +247,7 @@ var _ = Describe("Podman containers ", func() { // Ensure container is stopped data, err = containers.Inspect(connText, name, nil) Expect(err).To(BeNil()) - Expect(data.State.Status).To(Equal("exited")) + Expect(isStopped(data.State.Status)).To(BeTrue()) }) }) |