Merge pull request #747 from aanand/integration-test-fixes

Integration test improvements

Dockerfile

 FROM python:2.7
 MAINTAINER Joffrey F <joffrey@docker.com>
-ADD . /home/docker-py
+
+RUN mkdir /home/docker-py
 WORKDIR /home/docker-py
+
+ADD requirements.txt /home/docker-py/requirements.txt
+RUN pip install -r requirements.txt
+
+ADD test-requirements.txt /home/docker-py/test-requirements.txt
 RUN pip install -r test-requirements.txt
+
+ADD . /home/docker-py
 RUN pip install .

Dockerfile-py3

 FROM python:3.4
 MAINTAINER Joffrey F <joffrey@docker.com>
-ADD . /home/docker-py
+
+RUN mkdir /home/docker-py
 WORKDIR /home/docker-py
+
+ADD requirements.txt /home/docker-py/requirements.txt
+RUN pip install -r requirements.txt
+
+ADD test-requirements.txt /home/docker-py/test-requirements.txt
 RUN pip install -r test-requirements.txt
+
+ADD . /home/docker-py
 RUN pip install .

Makefile

@@ -19,7 +19,7 @@ unit-test-py3: build-py3
 	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 py.test tests/integration_test.py
+	docker run -v `$(HOST_TMPDIR)`:/tmp -v /var/run/docker.sock:/var/run/docker.sock docker-py py.test -rxs 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 py.test tests/integration_test.py
+	docker run -v `$(HOST_TMPDIR)`:/tmp -v /var/run/docker.sock:/var/run/docker.sock docker-py3 py.test -rxs tests/integration_test.py