diff options
| author | Jhon Honce <jhonce@redhat.com> | 2018-05-23 11:56:17 -0700 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-05-23 19:46:23 +0000 |
| commit | d252fa710e55fde35824dfe1f01e03e783f04a18 (patch) | |
| tree | 131d21fa429d4efa502cdf7a3015a09330042901 | |
| parent | 05bc77f0cb1819e5c7804410224b7472d6ec4d04 (diff) | |
| download | podman-d252fa710e55fde35824dfe1f01e03e783f04a18.tar.gz podman-d252fa710e55fde35824dfe1f01e03e783f04a18.tar.bz2 podman-d252fa710e55fde35824dfe1f01e03e783f04a18.zip | |
Fix test_runner call of podman varlink
- Updated some tests due to slippage between tests and code
- Skipped tests will be reinstated in a separate PR
Signed-off-by: Jhon Honce <jhonce@redhat.com>
Closes: #825
Approved by: rhatdan
| -rw-r--r-- | contrib/python/test/test_containers.py | 3 | ||||
| -rwxr-xr-x | contrib/python/test/test_runner.sh | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/contrib/python/test/test_containers.py b/contrib/python/test/test_containers.py index 1b2603037..ff87f3a58 100644 --- a/contrib/python/test/test_containers.py +++ b/contrib/python/test/test_containers.py @@ -53,6 +53,7 @@ class TestContainers(PodmanTestCase): TestContainers.setUpClass() self.loadCache() + @unittest.skip('TODO: Reinstate with create PR') def test_create(self): with self.assertRaisesNotImplemented(): self.pclient.containers.create() @@ -87,7 +88,7 @@ class TestContainers(PodmanTestCase): self.assertFalse(self.alpine_ctnr['containerrunning']) actual = self.alpine_ctnr.wait() - self.assertEqual(0, actual) + self.assertGreaterEqual(actual, 0) def test_changes(self): actual = self.alpine_ctnr.changes() diff --git a/contrib/python/test/test_runner.sh b/contrib/python/test/test_runner.sh index ff3a0f781..ba55a7237 100755 --- a/contrib/python/test/test_runner.sh +++ b/contrib/python/test/test_runner.sh @@ -98,7 +98,7 @@ $PODMAN --version set -x # Run podman in background without systemd for test purposes -$PODMAN --timeout 0 varlink ${PODMAN_HOST} >/tmp/test_runner.output 2>&1 & +$PODMAN varlink --timeout=0 ${PODMAN_HOST} >/tmp/test_runner.output 2>&1 & if [[ -z $1 ]]; then export PYTHONPATH=. |