Fix test-docker-py on some arches
When running 'make all' on armhf, I got this:
> ---> Making bundle: .integration-daemon-start (in bundles/17.06.0-dev/test-docker-py)
> Using test binary docker
> INFO: Waiting for daemon to start...
> Starting dockerd
> .
> Traceback (most recent call last):
> File "/usr/local/lib/python2.7/dist-packages/_pytest/config.py", line
> 320, in _importconftest
> mod = conftestpath.pyimport()
> File "/usr/local/lib/python2.7/dist-packages/py/_path/local.py", line
> 662, in pyimport
> __import__(modname)
> File "/docker-py/tests/integration/conftest.py", line 6, in <module>
> import docker.errors
> File "/docker-py/docker/__init__.py", line 2, in <module>
> from .api import APIClient
> File "/docker-py/docker/api/__init__.py", line 2, in <module>
> from .client import APIClient
> File "/docker-py/docker/api/client.py", line 11, in <module>
> from .build import BuildApiMixin
> File "/docker-py/docker/api/build.py", line 6, in <module>
> from .. import auth
> File "/docker-py/docker/auth.py", line 6, in <module>
> import dockerpycreds
> ImportError: No module named dockerpycreds
> ERROR: could not load /docker-py/tests/integration/conftest.py
The fix for this was already provided by commit 0ec8f56a3 and
commit c7c923594, but for some reason it did not made its way
to Dockerfiles for all architectures.
While at it, remove excessive comments.
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Kir Kolyshkin authored on 2017/09/08 10:32:49Showing 5 changed files
| ... | ... |
@@ -149,9 +149,6 @@ RUN set -x \ |
| 149 | 149 |
# Get the "docker-py" source so we can run their integration tests |
| 150 | 150 |
ENV DOCKER_PY_COMMIT a962578e515185cf06506050b2200c0b81aa84ef |
| 151 | 151 |
# To run integration tests docker-pycreds is required. |
| 152 |
-# Before running the integration tests conftest.py is |
|
| 153 |
-# loaded which results in loads auth.py that |
|
| 154 |
-# imports the docker-pycreds module. |
|
| 155 | 152 |
RUN git clone https://github.com/docker/docker-py.git /docker-py \ |
| 156 | 153 |
&& cd /docker-py \ |
| 157 | 154 |
&& git checkout -q $DOCKER_PY_COMMIT \ |
| ... | ... |
@@ -125,9 +125,7 @@ RUN set -x \ |
| 125 | 125 |
|
| 126 | 126 |
# Get the "docker-py" source so we can run their integration tests |
| 127 | 127 |
ENV DOCKER_PY_COMMIT a962578e515185cf06506050b2200c0b81aa84ef |
| 128 |
-# Before running the integration tests conftest.py is |
|
| 129 |
-# loaded which results in loads auth.py that |
|
| 130 |
-# imports the docker-pycreds module. |
|
| 128 |
+# To run integration tests docker-pycreds is required. |
|
| 131 | 129 |
RUN git clone https://github.com/docker/docker-py.git /docker-py \ |
| 132 | 130 |
&& cd /docker-py \ |
| 133 | 131 |
&& git checkout -q $DOCKER_PY_COMMIT \ |
| ... | ... |
@@ -118,9 +118,11 @@ RUN set -x \ |
| 118 | 118 |
|
| 119 | 119 |
# Get the "docker-py" source so we can run their integration tests |
| 120 | 120 |
ENV DOCKER_PY_COMMIT a962578e515185cf06506050b2200c0b81aa84ef |
| 121 |
+# To run integration tests docker-pycreds is required. |
|
| 121 | 122 |
RUN git clone https://github.com/docker/docker-py.git /docker-py \ |
| 122 | 123 |
&& cd /docker-py \ |
| 123 | 124 |
&& git checkout -q $DOCKER_PY_COMMIT \ |
| 125 |
+ && pip install docker-pycreds==0.2.1 \ |
|
| 124 | 126 |
&& pip install -r test-requirements.txt |
| 125 | 127 |
|
| 126 | 128 |
# Set user.email so crosbymichael's in-container merge commits go smoothly |
| ... | ... |
@@ -117,9 +117,11 @@ RUN set -x \ |
| 117 | 117 |
|
| 118 | 118 |
# Get the "docker-py" source so we can run their integration tests |
| 119 | 119 |
ENV DOCKER_PY_COMMIT a962578e515185cf06506050b2200c0b81aa84ef |
| 120 |
+# To run integration tests docker-pycreds is required. |
|
| 120 | 121 |
RUN git clone https://github.com/docker/docker-py.git /docker-py \ |
| 121 | 122 |
&& cd /docker-py \ |
| 122 | 123 |
&& git checkout -q $DOCKER_PY_COMMIT \ |
| 124 |
+ && pip install docker-pycreds==0.2.1 \ |
|
| 123 | 125 |
&& pip install -r test-requirements.txt |
| 124 | 126 |
|
| 125 | 127 |
# Set user.email so crosbymichael's in-container merge commits go smoothly |
| ... | ... |
@@ -110,9 +110,11 @@ RUN set -x \ |
| 110 | 110 |
|
| 111 | 111 |
# Get the "docker-py" source so we can run their integration tests |
| 112 | 112 |
ENV DOCKER_PY_COMMIT a962578e515185cf06506050b2200c0b81aa84ef |
| 113 |
+# To run integration tests docker-pycreds is required. |
|
| 113 | 114 |
RUN git clone https://github.com/docker/docker-py.git /docker-py \ |
| 114 | 115 |
&& cd /docker-py \ |
| 115 | 116 |
&& git checkout -q $DOCKER_PY_COMMIT \ |
| 117 |
+ && pip install docker-pycreds==0.2.1 \ |
|
| 116 | 118 |
&& pip install -r test-requirements.txt |
| 117 | 119 |
|
| 118 | 120 |
# Set user.email so crosbymichael's in-container merge commits go smoothly |