Merge branch 'aanand-pytest'

.dockerignore

@@ -10,6 +10,7 @@ dist
 .tox
 .coverage
 html/*
+tests/__pycache__
 
 # Compiled Documentation
 site/

Makefile

@@ -13,13 +13,13 @@ build-py3:
 test: unit-test integration-test unit-test-py3 integration-test-py3
 
 unit-test: build
-	docker run docker-py python tests/test.py
+	docker run docker-py py.test tests/test.py tests/utils_test.py
 
 unit-test-py3: build-py3
-	docker run docker-py3 python tests/test.py
+	docker run docker-py3 py.test tests/test.py tests/utils_test.py
 
 integration-test: build
-	docker run -e NOT_ON_HOST=true -v `$(HOST_TMPDIR)`:/tmp -v /var/run/docker.sock:/var/run/docker.sock docker-py python tests/integration_test.py
+	docker run -e NOT_ON_HOST=true -v `$(HOST_TMPDIR)`:/tmp -v /var/run/docker.sock:/var/run/docker.sock docker-py py.test tests/integration_test.py
 
 integration-test-py3: build-py3
-	docker run -e NOT_ON_HOST=true -v `$(HOST_TMPDIR)`:/tmp -v /var/run/docker.sock:/var/run/docker.sock docker-py3 python tests/integration_test.py
+	docker run -e NOT_ON_HOST=true -v `$(HOST_TMPDIR)`:/tmp -v /var/run/docker.sock:/var/run/docker.sock docker-py3 py.test tests/integration_test.py

test-requirements.txt

 mock==1.0.1
-coverage==3.7.1
+pytest==2.7.2
+pytest-cov==2.1.0

tests/fake_api.py

@@ -12,7 +12,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-import fake_stat
+from . import fake_stat
 
 CURRENT_VERSION = 'v1.19'
 

tests/integration_test.py

@@ -33,7 +33,7 @@ import six
 from six.moves import BaseHTTPServer
 from six.moves import socketserver
 
-from test import Cleanup
+from .test import Cleanup
 
 # FIXME: missing tests for
 # export; history; insert; port; push; tag; get; load; stats

tests/utils_test.py

 import os
 import os.path
-import unittest
 import tempfile
 
 from docker.client import Client
@@ -13,7 +12,9 @@ from docker.utils import (
 from docker.utils.ports import build_port_bindings, split_port
 from docker.auth import resolve_repository_name, resolve_authconfig
 
-import base
+from . import base
+
+import pytest
 
 
 class UtilsTest(base.BaseTestCase):
@@ -80,13 +81,8 @@ class UtilsTest(base.BaseTestCase):
         }
 
         for host in invalid_hosts:
-            try:
-                parsed = parse_host(host)
-                self.fail('Expected to fail but success: %s -> %s' % (
-                    host, parsed
-                ))
-            except DockerException:
-                pass
+            with pytest.raises(DockerException):
+                parse_host(host)
 
         for host, expected in valid_hosts.items():
             self.assertEqual(parse_host(host), expected, msg=host)
@@ -476,6 +472,3 @@ class UtilsTest(base.BaseTestCase):
             ["127.0.0.1:1000:1000", "127.0.0.1:2000:2000"])
         self.assertEqual(port_bindings["1000"], [("127.0.0.1", "1000")])
         self.assertEqual(port_bindings["2000"], [("127.0.0.1", "2000")])
-
-if __name__ == '__main__':
-    unittest.main()

tox.ini

@@ -5,11 +5,7 @@ skipsdist=True
 [testenv]
 usedevelop=True
 commands =
-    {envbindir}/coverage run -p tests/test.py
-    {envbindir}/coverage run -p tests/utils_test.py
-    {envbindir}/coverage combine
-    {envbindir}/coverage report
-    {envbindir}/coverage html
+    py.test --cov=docker tests/test.py tests/utils_test.py
 deps =
     -r{toxinidir}/test-requirements.txt
     -r{toxinidir}/requirements.txt