From b5f1e64e8f18b313019fd47a431115cf881873e8 Mon Sep 17 00:00:00 2001
From: Joffrey F <joffrey@docker.com>
Date: Tue, 25 Aug 2015 16:58:01 -0700
Subject: [PATCH] Ensure Makefile still run tests properly / tests are run in
 container as expected

---
 .dockerignore             | 1 +
 Makefile                  | 8 ++++----
 tests/integration_test.py | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index ababae31..c767879b 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -10,6 +10,7 @@ dist
 .tox
 .coverage
 html/*
+tests/__pycache__
 
 # Compiled Documentation
 site/
diff --git a/Makefile b/Makefile
index c24cbc44..70ee843b 100644
--- a/Makefile
+++ b/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 py.test 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 py.test 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
diff --git a/tests/integration_test.py b/tests/integration_test.py
index c1e6d306..815cd37d 100644
--- a/tests/integration_test.py
+++ b/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