From: Daniel Axtens <dja@axtens.net>
Date: Tue, 9 Aug 2016 04:55:24 +0000 (+1000)
Subject: Enable tox tests in Docker
X-Git-Tag: v2.0.0-rc1~282
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=44c243ef5fb93ce85f171ddc80fb6927ca1b5dbb;p=thirdparty%2Fpatchwork.git

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>
---

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