Start using pytest

Author: richfitz

conftest.py

@@ -83,7 +83,7 @@ def container_wait_running(container, poll=0.1, timeout=1):
     if container.status != "running":
         raise Exception("container '{}' ({}) is not running ({})".format(
             container.name, container.id[:8], container.status))
-    time.sleep(poll)
+    time.sleep(timeout)
     container.reload()
     if container.status != "running":
         raise Exception("container '{}' ({}) is no longer running ({})".format(

orderly_web/docker_helpers.py

@@ -1,3 +1,4 @@
 docker
 docopt
+pytest
 pyyaml

requirements.txt

@@ -0,0 +1,2 @@
+[aliases]
+test=pytest

setup.cfg

@@ -12,22 +12,20 @@
           "License :: OSI Approved :: MIT License",
           "Operating System :: OS Independent",
       ],
-      # keywords
       url="https://github.com/vimc/orderly-web-deploy",
       author="Rich FitzJohn",
       author_email="[email protected]",
       license='MIT',
       packages=find_packages(),
-      # install_requires
-      test_suite="nose.collector",
-      tests_require=["nose"],
       entry_points={
           'console_scripts': ['orderly-web=orderly_web.cli:main'],
       },
       include_package_data=True,
       zip_safe=False,
       # Extra:
       long_description_content_type="text/markdown",
+      setup_requires=["pytest-runner"],
+      tests_require=["pytest"],
       requires=[
           "docker",
           "docopt",

setup.py

@@ -1,34 +1,49 @@
-from unittest import TestCase
+import pytest
 
 from orderly_web.docker_helpers import *
 
 
-class TestDockerHelpers(TestCase):
+def test_exec_safely_throws_on_failure():
+    with docker_client() as cl:
+        container = cl.containers.run("alpine", ["sleep", "10"],
+                                      detach=True, auto_remove=True)
+        with pytest.raises(Exception):
+            exec_safely(container, "missing_command")
+        container.kill()
 
-    def test_exec_safely_throws_on_failure(self):
-        with docker_client() as cl:
-            container = cl.containers.run("alpine", ["sleep", "10"],
-                                          detach=True, auto_remove=True)
-            with self.assertRaises(Exception):
-                exec_safely(container, "missing_command")
-            container.kill()
+def test_stop_and_remove_container_works():
+    with docker_client() as cl:
+        container = cl.containers.run("alpine", ["sleep", "10"],
+                                      detach=True)
+        name = container.name
+        assert container_exists(cl, name)
+        stop_and_remove_container(cl, name, False, 1)
+        assert not container_exists(cl, name)
 
-    def test_stop_and_remove_container_works(self):
-        with docker_client() as cl:
-            container = cl.containers.run("alpine", ["sleep", "10"],
+def test_string_into_container():
+    with docker_client() as cl:
+        container = cl.containers.run("alpine", ["sleep", "20"],
+                                      detach=True, auto_remove=True)
+        text = "a\nb\nc\n"
+        string_into_container(container, text, "/test")
+        out = container.exec_run(["cat", "/test"])
+        assert out[0] == 0
+        assert out[1].decode("UTF-8") == text
+        container.kill()
+
+
+def test_container_wait_running_detects_start_failure():
+    with docker_client() as cl:
+        container = cl.containers.create("alpine")
+        with pytest.raises(Exception) as e:
+            container_wait_running(container, 0.1, 0.1)
+        assert "is not running (created)" in str(e)
+
+
+def test_container_wait_running_detects_slow_failure():
+    with docker_client() as cl:
+        with pytest.raises(Exception) as e:
+            container = cl.containers.run("alpine", ["sleep", "1"],
                                           detach=True)
-            name = container.name
-            self.assertTrue(container_exists(cl, name))
-            stop_and_remove_container(cl, name, False, 1)
-            self.assertFalse(container_exists(cl, name))
-
-    def test_string_into_container(self):
-        with docker_client() as cl:
-            container = cl.containers.run("alpine", ["sleep", "20"],
-                                          detach=True, auto_remove=True)
-            text = "a\nb\nc\n"
-            string_into_container(container, text, "/test")
-            out = container.exec_run(["cat", "/test"])
-            self.assertEqual(out[0], 0)
-            self.assertEqual(out[1].decode("UTF-8"), text)
-            container.kill()
+            container_wait_running(container, 0.1, 1.2)
+        assert "is no longer running (exited)" in str(e)