Signed-off-by: Tibor Vass <tibor@docker.com>
| ... | ... |
@@ -141,10 +141,11 @@ RUN set -x \ |
| 141 | 141 |
&& rm -rf "$GOPATH" |
| 142 | 142 |
|
| 143 | 143 |
# Get the "docker-py" source so we can run their integration tests |
| 144 |
-ENV DOCKER_PY_COMMIT 139850f3f3b17357bab5ba3edfb745fb14043764 |
|
| 144 |
+ENV DOCKER_PY_COMMIT 47ab89ec2bd3bddf1221b856ffbaff333edeabb4 |
|
| 145 | 145 |
RUN git clone https://github.com/docker/docker-py.git /docker-py \ |
| 146 | 146 |
&& cd /docker-py \ |
| 147 |
- && git checkout -q $DOCKER_PY_COMMIT |
|
| 147 |
+ && git checkout -q $DOCKER_PY_COMMIT \ |
|
| 148 |
+ && pip install -r test-requirements.txt |
|
| 148 | 149 |
|
| 149 | 150 |
# Setup s3cmd config |
| 150 | 151 |
RUN { \
|
| ... | ... |
@@ -12,7 +12,7 @@ set -e |
| 12 | 12 |
} |
| 13 | 13 |
|
| 14 | 14 |
# exporting PYTHONPATH to import "docker" from our local docker-py |
| 15 |
- test_env PYTHONPATH="$dockerPy" NOT_ON_HOST=true python "$dockerPy/tests/integration_test.py" |
|
| 15 |
+ test_env PYTHONPATH="$dockerPy" py.test "$dockerPy/tests/integration" |
|
| 16 | 16 |
|
| 17 | 17 |
bundle .integration-daemon-stop |
| 18 | 18 |
) 2>&1 | tee -a "$DEST/test.log" |