diff options
| author | Aanand Prasad <aanand.prasad@gmail.com> | 2015-09-25 19:53:10 +0200 |
|---|---|---|
| committer | Aanand Prasad <aanand.prasad@gmail.com> | 2015-09-25 20:16:57 +0200 |
| commit | b2c4228bb81ef30e6fce58f1a484c6d50300554a (patch) | |
| tree | 23bcd27b70b6f86ca3f29732e2f2b3ac7f07ff50 | |
| parent | 26e22bbd391c9712db643d85087a5113d11c6c82 (diff) | |
| download | docker-py-b2c4228bb81ef30e6fce58f1a484c6d50300554a.tar.gz | |
Move pytest default options into pytest.ini
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | pytest.ini | 2 |
2 files changed, 6 insertions, 4 deletions
@@ -20,15 +20,15 @@ unit-test-py3: build-py3 docker run docker-py3 py.test tests/test.py tests/utils_test.py integration-test: build - docker run -v /var/run/docker.sock:/var/run/docker.sock docker-py py.test -rxs tests/integration_test.py + docker run -v /var/run/docker.sock:/var/run/docker.sock docker-py py.test tests/integration_test.py integration-test-py3: build-py3 - docker run -v /var/run/docker.sock:/var/run/docker.sock docker-py3 py.test -rxs tests/integration_test.py + docker run -v /var/run/docker.sock:/var/run/docker.sock docker-py3 py.test tests/integration_test.py integration-dind: build build-py3 docker run -d --name dpy-dind --privileged dockerswarm/dind:1.8.1 docker -d -H tcp://0.0.0.0:2375 - docker run --env="DOCKER_HOST=tcp://docker:2375" --link=dpy-dind:docker docker-py py.test -rxs tests/integration_test.py - docker run --env="DOCKER_HOST=tcp://docker:2375" --link=dpy-dind:docker docker-py3 py.test -rxs tests/integration_test.py + docker run --env="DOCKER_HOST=tcp://docker:2375" --link=dpy-dind:docker docker-py py.test tests/integration_test.py + docker run --env="DOCKER_HOST=tcp://docker:2375" --link=dpy-dind:docker docker-py3 py.test tests/integration_test.py docker rm -vf dpy-dind flake8: build diff --git a/pytest.ini b/pytest.ini new file mode 100644 index 0000000..d165ad1 --- /dev/null +++ b/pytest.ini @@ -0,0 +1,2 @@ +[pytest] +addopts = -rxs |