From 9074565f4e623124f17ce02657e35d658abafae5 Mon Sep 17 00:00:00 2001 From: Jhon Honce Date: Tue, 25 Sep 2018 10:09:16 -0700 Subject: Implement pod varlink bindings * Update varlink document * Add NoContainersInPod error in go and python * Add support for varlink pod interface * New code passes pylint * Fix bug in test_runner.sh * Update integration tests for race condition on status check * Add missing port config file support Signed-off-by: Jhon Honce --- contrib/python/podman/test/test_pods_ctnrs.py | 65 ++++++++++++++++ contrib/python/podman/test/test_pods_no_ctnrs.py | 94 ++++++++++++++++++++++++ contrib/python/podman/test/test_runner.sh | 2 +- 3 files changed, 160 insertions(+), 1 deletion(-) create mode 100644 contrib/python/podman/test/test_pods_ctnrs.py create mode 100644 contrib/python/podman/test/test_pods_no_ctnrs.py (limited to 'contrib/python/podman/test') diff --git a/contrib/python/podman/test/test_pods_ctnrs.py b/contrib/python/podman/test/test_pods_ctnrs.py new file mode 100644 index 000000000..c5733091c --- /dev/null +++ b/contrib/python/podman/test/test_pods_ctnrs.py @@ -0,0 +1,65 @@ +import os +from test.podman_testcase import PodmanTestCase + +import podman +from podman import FoldedString + +pod = None + + +class TestPodsCtnrs(PodmanTestCase): + @classmethod + def setUpClass(cls): + # Populate storage + super().setUpClass() + + @classmethod + def tearDownClass(cls): + super().tearDownClass() + + def setUp(self): + self.tmpdir = os.environ['TMPDIR'] + self.host = os.environ['PODMAN_HOST'] + + self.pclient = podman.Client(self.host) + + def test_010_populate(self): + global pod + + pod = self.pclient.pods.create('pod1') + self.assertEqual('pod1', pod.name) + + img = self.pclient.images.get('docker.io/library/alpine:latest') + ctnr = img.container(pod=pod.id) + + pod.refresh() + self.assertEqual('1', pod.numberofcontainers) + self.assertEqual(ctnr.id, pod.containersinfo[0]['id']) + + def test_015_one_shot(self): + global pod + + details = pod.inspect() + state = FoldedString(details.containers[0]['state']) + self.assertEqual(state, 'configured') + + pod = pod.start() + status = FoldedString(pod.containersinfo[0]['status']) + # Race on whether container is still running or finished + self.assertIn(status, ('exited', 'running')) + + pod = pod.restart() + status = FoldedString(pod.containersinfo[0]['status']) + self.assertIn(status, ('exited', 'running')) + + killed = pod.kill() + self.assertEqual(pod, killed) + + def test_999_remove(self): + global pod + + ident = pod.remove(force=True) + self.assertEqual(ident, pod.id) + + with self.assertRaises(StopIteration): + next(self.pclient.pods.list()) diff --git a/contrib/python/podman/test/test_pods_no_ctnrs.py b/contrib/python/podman/test/test_pods_no_ctnrs.py new file mode 100644 index 000000000..48b4f74e4 --- /dev/null +++ b/contrib/python/podman/test/test_pods_no_ctnrs.py @@ -0,0 +1,94 @@ +import os +import unittest + +import podman +import varlink + +ident = None +pod = None + + +class TestPodsNoCtnrs(unittest.TestCase): + def setUp(self): + self.tmpdir = os.environ['TMPDIR'] + self.host = os.environ['PODMAN_HOST'] + + self.pclient = podman.Client(self.host) + + def test_010_create(self): + global ident + + actual = self.pclient.pods.create('pod0') + self.assertIsNotNone(actual) + ident = actual.id + + def test_015_list(self): + global ident, pod + + actual = next(self.pclient.pods.list()) + self.assertEqual('pod0', actual.name) + self.assertEqual(ident, actual.id) + self.assertEqual('Created', actual.status) + self.assertEqual('0', actual.numberofcontainers) + self.assertFalse(actual.containersinfo) + pod = actual + + def test_020_get(self): + global ident, pod + + actual = self.pclient.pods.get(pod.id) + self.assertEqual('pod0', actual.name) + self.assertEqual(ident, actual.id) + self.assertEqual('Created', actual.status) + self.assertEqual('0', actual.numberofcontainers) + self.assertFalse(actual.containersinfo) + + def test_025_inspect(self): + global ident, pod + + details = pod.inspect() + self.assertEqual(ident, details.id) + self.assertEqual('pod0', details.config['name']) + self.assertIsNone(details.containers) + + def test_030_ident_no_ctnrs(self): + global ident, pod + + actual = pod.kill() + self.assertEqual(pod, actual) + + actual = pod.pause() + self.assertEqual(pod, actual) + + actual = pod.unpause() + self.assertEqual(pod, actual) + + actual = pod.stop() + self.assertEqual(pod, actual) + + def test_045_raises_no_ctnrs(self): + global ident, pod + + with self.assertRaises(podman.NoContainersInPod): + pod.start() + + with self.assertRaises(podman.NoContainersInPod): + pod.restart() + + with self.assertRaises(podman.NoContainerRunning): + next(pod.stats()) + + with self.assertRaises(varlink.error.MethodNotImplemented): + pod.top() + + with self.assertRaises(varlink.error.MethodNotImplemented): + pod.wait() + + def test_999_remove(self): + global ident, pod + + actual = pod.remove() + self.assertEqual(ident, actual) + + with self.assertRaises(StopIteration): + next(self.pclient.pods.list()) diff --git a/contrib/python/podman/test/test_runner.sh b/contrib/python/podman/test/test_runner.sh index 76432cf47..ce518e7ed 100755 --- a/contrib/python/podman/test/test_runner.sh +++ b/contrib/python/podman/test/test_runner.sh @@ -14,7 +14,7 @@ fi export PATH=../../../bin:$PATH function usage { - echo 1>&2 $0 [-v] [-h] [test.TestCase|test.TestCase.step] + echo 1>&2 $0 '[-v] [-h] [test.|test..]' } while getopts "vh" arg; do -- cgit v1.2.3-54-g00ecf