Merge branch 'aanand-pytest'

Author: shin-

.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

@@ -1,2 +1,3 @@
 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 @@
 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