From 087592df2c0759f05c62b00bc50992c10b3b1426 Mon Sep 17 00:00:00 2001 From: Thomas LEVEIL Date: Sat, 28 Jan 2017 15:10:10 +0100 Subject: [PATCH] TESTS: simplify nginx-proxy-tester.sh --- test2/nginx-proxy-tester.sh | 14 ++------------ test2/pytest.ini | 3 +++ 2 files changed, 5 insertions(+), 12 deletions(-) create mode 100644 test2/pytest.ini diff --git a/test2/nginx-proxy-tester.sh b/test2/nginx-proxy-tester.sh index c04e328..830736a 100755 --- a/test2/nginx-proxy-tester.sh +++ b/test2/nginx-proxy-tester.sh @@ -17,20 +17,10 @@ if [[ "$(docker images -q nginx-proxy-tester 2>/dev/null)" == "" ]]; then docker build -t nginx-proxy-tester -f $DIR/requirements/Dockerfile-nginx-proxy-tester $DIR/requirements fi -# delete python cache -[[ -d "${DIR}/__pycache__" ]] && rm "${DIR}/__pycache__" -rf - # run the nginx-proxy-tester container setting the correct value for the working dir in order for # docker-compose to work properly when run from within that container. -docker run --rm -it \ - -v ${DIR}:/${DIR} \ - -v ${DIR}/__pycache__/ \ +exec docker run --rm -it \ + -v ${DIR}:/${DIR}:ro \ -w ${DIR} \ -v /var/run/docker.sock:/var/run/docker.sock \ nginx-proxy-tester ${ARGS} -PYTEST_EXIT_CODE=$? - -# delete python cache -[[ -d "${DIR}/__pycache__" ]] && rm "${DIR}/__pycache__" -rf - -exit ${PYTEST_EXIT_CODE} diff --git a/test2/pytest.ini b/test2/pytest.ini new file mode 100644 index 0000000..2670927 --- /dev/null +++ b/test2/pytest.ini @@ -0,0 +1,3 @@ +[pytest] +# disable the creation of the `.cache` folders +addopts = -p no:cacheprovider \ No newline at end of file