diff options
| author | Matthew Heon <matthew.heon@gmail.com> | 2018-11-05 17:18:09 -0500 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@gmail.com> | 2018-11-07 09:46:44 -0500 |
| commit | fa76b86e3e6b0d4e3bfc830fb087c0e38bbf17ef (patch) | |
| tree | 30bf646ae418b7a7c1a412d5dcebbff960e70a25 /contrib | |
| parent | 9150d69087aed8f52b169eaf556159cc8b1d26d3 (diff) | |
| download | podman-fa76b86e3e6b0d4e3bfc830fb087c0e38bbf17ef.tar.gz podman-fa76b86e3e6b0d4e3bfc830fb087c0e38bbf17ef.tar.bz2 podman-fa76b86e3e6b0d4e3bfc830fb087c0e38bbf17ef.zip | |
Temporarily fix the Python tests to fix some PRs
The Python podman bindings have issues around kill - specifically
attempting to make it act like stop, when it should not. We
provide no guarantee of what state a container if in after kill -
it should be stopped, but we might have sent something that's not
SIGKILL. If you want a container or pod stopped, guaranteed, use
Stop().
The Python code attempted to ensure a container was actually
stopped after kill was run, which runs counter the above. This
was holding up some PRs that caused changes in how libpod obtains
its state, so for now, change pod kill to pod stop until the
proper changes in the Python code can be made.
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/python/podman/test/test_pods_ctnrs.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/python/podman/test/test_pods_ctnrs.py b/contrib/python/podman/test/test_pods_ctnrs.py index 14ce95c8a..009e30720 100644 --- a/contrib/python/podman/test/test_pods_ctnrs.py +++ b/contrib/python/podman/test/test_pods_ctnrs.py @@ -52,7 +52,8 @@ class TestPodsCtnrs(PodmanTestCase): status = FoldedString(pod.containersinfo[0]['status']) self.assertIn(status, ('stopped', 'exited', 'running')) - killed = pod.kill() + # Pod kill is broken, so use stop for now + killed = pod.stop() self.assertEqual(pod, killed) def test_999_remove(self): |