diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-10-13 04:56:33 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-13 04:56:33 -0700 |
| commit | 2c4f3d6dad524ce9886b044ea7a22df05043264c (patch) | |
| tree | 1f5bbccd42e843d223eaa5cfa08133253d5d1673 /contrib/python/podman/test | |
| parent | b0b6dc40bd916698f87bc68f7b4b603582e93ef2 (diff) | |
| parent | 40cb7568017a36b411801608a32cdd8502287924 (diff) | |
| download | podman-2c4f3d6dad524ce9886b044ea7a22df05043264c.tar.gz podman-2c4f3d6dad524ce9886b044ea7a22df05043264c.tar.bz2 podman-2c4f3d6dad524ce9886b044ea7a22df05043264c.zip | |
Merge pull request #1635 from jwhonce/wip/pods
Add support for pod commands
Diffstat (limited to 'contrib/python/podman/test')
| -rw-r--r-- | contrib/python/podman/test/test_images.py | 2 | ||||
| -rwxr-xr-x | contrib/python/podman/test/test_runner.sh | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/contrib/python/podman/test/test_images.py b/contrib/python/podman/test/test_images.py index 854f57dd7..f6b95f98a 100644 --- a/contrib/python/podman/test/test_images.py +++ b/contrib/python/podman/test/test_images.py @@ -64,7 +64,7 @@ class TestImages(PodmanTestCase): self.assertEqual(actual.status, 'configured') ctnr = actual.start() - self.assertIn(ctnr.status, ['running', 'exited']) + self.assertIn(ctnr.status, ['running', 'stopped', 'exited']) ctnr_details = ctnr.inspect() for e in img_details.containerconfig['env']: diff --git a/contrib/python/podman/test/test_runner.sh b/contrib/python/podman/test/test_runner.sh index ce518e7ed..1b7e0a85e 100755 --- a/contrib/python/podman/test/test_runner.sh +++ b/contrib/python/podman/test/test_runner.sh @@ -119,15 +119,18 @@ if [[ -n $VERBOSE ]]; then fi PODMAN="podman $PODMAN_ARGS" -cat >/tmp/test_podman.output <<-EOT +cat <<-EOT |tee /tmp/test_podman.output $($PODMAN --version) $PODMAN varlink --timeout=0 ${PODMAN_HOST} ========================================== EOT # Run podman in background without systemd for test purposes -set -x $PODMAN varlink --timeout=0 ${PODMAN_HOST} >>/tmp/test_podman.output 2>&1 & +if [[ $? != 0 ]]; then + echo 1>&2 Failed to start podman + showlog /tmp/test_podman.output +fi if [[ -z $1 ]]; then export PYTHONPATH=. @@ -139,7 +142,6 @@ else RETURNCODE=$? fi -set +x pkill -9 podman pkill -9 conmon |