From b2c4228bb81ef30e6fce58f1a484c6d50300554a Mon Sep 17 00:00:00 2001 From: Aanand Prasad Date: Fri, 25 Sep 2015 19:53:10 +0200 Subject: [PATCH 1/2] Move pytest default options into pytest.ini Signed-off-by: Aanand Prasad --- Makefile | 8 ++++---- pytest.ini | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 pytest.ini diff --git a/Makefile b/Makefile index f98abe74a2..30421e506c 100644 --- a/Makefile +++ b/Makefile @@ -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 0000000000..d165ad1b26 --- /dev/null +++ b/pytest.ini @@ -0,0 +1,2 @@ +[pytest] +addopts = -rxs From 95f42d163137177f9c77d2550ce84eec35b141e9 Mon Sep 17 00:00:00 2001 From: Aanand Prasad Date: Fri, 25 Sep 2015 20:17:25 +0200 Subject: [PATCH 2/2] Shorter pytest stack traces Signed-off-by: Aanand Prasad --- pytest.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pytest.ini b/pytest.ini index d165ad1b26..21b47a6aaa 100644 --- a/pytest.ini +++ b/pytest.ini @@ -1,2 +1,2 @@ [pytest] -addopts = -rxs +addopts = --tb=short -rxs