From 44c243ef5fb93ce85f171ddc80fb6927ca1b5dbb Mon Sep 17 00:00:00 2001 From: Daniel Axtens Date: Tue, 9 Aug 2016 14:55:24 +1000 Subject: [PATCH] Enable tox tests in Docker Update the entrypoint script to allow you to do --tox and --quick-tox in the same way as --test and --quick-test. Update the readme appropriately. Signed-off-by: Daniel Axtens Reviewed-by: Stephen Finucane --- README.md | 2 ++ docker/entrypoint.sh | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/README.md b/README.md index 3c25f04d..996d5064 100644 --- a/README.md +++ b/README.md @@ -60,6 +60,8 @@ of community projects. $ docker-compose run --rm web --test + * Tox tests can be run with `--quick-tox` and `--tox`. + * To reset the database before beginning, add `--reset` to the command line after `web` and before any other arguments. * If you want to run non-headless tests, you'll need something like this ugly hack: diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index 8efaadad..744ed690 100755 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -81,6 +81,13 @@ elif [ "$1" == "--quick-test" ]; then python3 manage.py test elif [ "$1" == "--test" ]; then xvfb-run --server-args='-screen 0, 1024x768x16' python3 manage.py test +elif [ "$1" == "--quick-tox" ]; then + shift + export PW_SKIP_BROWSER_TESTS=yes + tox $@ +elif [ "$1" == "--tox" ]; then + shift + xvfb-run --server-args='-screen 0, 1024x768x16' tox $@ else # run whatever CMD is set to $@ fi -- 2.47.3