diff options
| author | Daniel Axtens <dja@axtens.net> | 2016-08-09 14:55:24 +1000 |
|---|---|---|
| committer | Stephen Finucane <stephenfinucane@hotmail.com> | 2016-08-21 17:00:48 +0100 |
| commit | 44c243ef5fb93ce85f171ddc80fb6927ca1b5dbb (patch) | |
| tree | 80134837c67d4a1ca4d23cc08090f8e4439106bd | |
| parent | 2f452486e2b82368e2a0f850e835a24fb45368d7 (diff) | |
| download | patchwork-44c243ef5fb93ce85f171ddc80fb6927ca1b5dbb.tar patchwork-44c243ef5fb93ce85f171ddc80fb6927ca1b5dbb.tar.gz | |
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 <dja@axtens.net>
Reviewed-by: Stephen Finucane <stephenfinucane@hotmail.com>
| -rw-r--r-- | README.md | 2 | ||||
| -rwxr-xr-x | docker/entrypoint.sh | 7 |
2 files changed, 9 insertions, 0 deletions
@@ -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 8efaada..744ed69 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 |