From b78e8b77566527980c57fbe74c9a4e1eecaad881 Mon Sep 17 00:00:00 2001
From: Tibor Vass <tibor@docker.com>
Date: Wed, 28 Oct 2015 12:56:50 -0400
Subject: [PATCH] docker-py: upgrade and fix test script

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 8db141049f5323d754584f265b267e52ee5d9e17
Component: engine
---
 components/engine/Dockerfile               | 5 +++--
 components/engine/hack/make/test-docker-py | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/components/engine/Dockerfile b/components/engine/Dockerfile
index c73dee9606..4c6825c966 100644
--- a/components/engine/Dockerfile
+++ b/components/engine/Dockerfile
@@ -141,10 +141,11 @@ RUN set -x \
 	&& rm -rf "$GOPATH"
 
 # Get the "docker-py" source so we can run their integration tests
-ENV DOCKER_PY_COMMIT 139850f3f3b17357bab5ba3edfb745fb14043764
+ENV DOCKER_PY_COMMIT 47ab89ec2bd3bddf1221b856ffbaff333edeabb4
 RUN git clone https://github.com/docker/docker-py.git /docker-py \
 	&& cd /docker-py \
-	&& git checkout -q $DOCKER_PY_COMMIT
+	&& git checkout -q $DOCKER_PY_COMMIT \
+	&& pip install -r test-requirements.txt
 
 # Setup s3cmd config
 RUN { \
diff --git a/components/engine/hack/make/test-docker-py b/components/engine/hack/make/test-docker-py
index 83fd620772..dece8315a3 100644
--- a/components/engine/hack/make/test-docker-py
+++ b/components/engine/hack/make/test-docker-py
@@ -12,7 +12,7 @@ set -e
 	}
 
 	# exporting PYTHONPATH to import "docker" from our local docker-py
-	test_env PYTHONPATH="$dockerPy" NOT_ON_HOST=true python "$dockerPy/tests/integration_test.py"
+	test_env PYTHONPATH="$dockerPy" py.test "$dockerPy/tests/integration"
 
 	bundle .integration-daemon-stop
 ) 2>&1 | tee -a "$DEST/test.log"