aboutsummaryrefslogtreecommitdiff
path: root/contrib/python/podman/test
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-10-03 06:06:14 -0700
committerGitHub <noreply@github.com>2018-10-03 06:06:14 -0700
commita3c4ce6717cab56d968fbe1fff0ced19f45c23cb (patch)
tree41657a47b6edeb8ab4776eddf64cb76f59b2813c /contrib/python/podman/test
parentd5687946f6a0aa14a5326f26ca0ceca68588056f (diff)
parent978aac665060140f08a5574e3611a17cc98516c0 (diff)
downloadpodman-a3c4ce6717cab56d968fbe1fff0ced19f45c23cb.tar.gz
podman-a3c4ce6717cab56d968fbe1fff0ced19f45c23cb.tar.bz2
podman-a3c4ce6717cab56d968fbe1fff0ced19f45c23cb.zip
Merge pull request #1531 from mheon/add_exited_state
Add ContainerStateExited and OCI delete() in cleanup()
Diffstat (limited to 'contrib/python/podman/test')
-rw-r--r--contrib/python/podman/test/test_pods_ctnrs.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/python/podman/test/test_pods_ctnrs.py b/contrib/python/podman/test/test_pods_ctnrs.py
index c5733091c..14ce95c8a 100644
--- a/contrib/python/podman/test/test_pods_ctnrs.py
+++ b/contrib/python/podman/test/test_pods_ctnrs.py
@@ -46,11 +46,11 @@ class TestPodsCtnrs(PodmanTestCase):
pod = pod.start()
status = FoldedString(pod.containersinfo[0]['status'])
# Race on whether container is still running or finished
- self.assertIn(status, ('exited', 'running'))
+ self.assertIn(status, ('stopped', 'exited', 'running'))
pod = pod.restart()
status = FoldedString(pod.containersinfo[0]['status'])
- self.assertIn(status, ('exited', 'running'))
+ self.assertIn(status, ('stopped', 'exited', 'running'))
killed = pod.kill()
self.assertEqual(pod, killed)