summaryrefslogtreecommitdiff
path: root/TESTING.rst
diff options
context:
space:
mode:
authorStephen Finucane <stephenfin@redhat.com>2019-04-01 14:44:48 +0100
committerStephen Finucane <stephenfin@redhat.com>2019-04-03 15:05:42 +0100
commit390f0715633abecd37a4cc97c8a1d1388f6c3bd5 (patch)
treecf383223a2efab85747827d954c482d64067085a /TESTING.rst
parent1cbaa2969bb224b5396d36d9c2b91dae85b47dc3 (diff)
downloadzuul-390f0715633abecd37a4cc97c8a1d1388f6c3bd5.tar.gz
tox: Integrate tox-docker
This allows us to start a zookeeper instance via docker as part of the standard tox process, avoiding issues like those described in [1]. It's exposed as a separate target, to ensure users can use local installations if necessary. This requires bumping the minimum version of tox to 3.2 so we can make use of the 'requires' config option [2]. [1] https://review.openstack.org/#/c/648399/ [2] https://tox.readthedocs.io/en/latest/config.html#conf-requires Change-Id: Ie848d409533b2a53523cd930299acf21ac10e13c Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
Diffstat (limited to 'TESTING.rst')
-rw-r--r--TESTING.rst8
1 files changed, 5 insertions, 3 deletions
diff --git a/TESTING.rst b/TESTING.rst
index f4172755b..26ef1051f 100644
--- a/TESTING.rst
+++ b/TESTING.rst
@@ -14,11 +14,13 @@ Detailed information on testing can be found here: https://wiki.openstack.org/wi
More information on pip here: http://www.pip-installer.org/en/latest/
-*Use pip to install tox*::
+*Use pip to install tox and tox-docker*::
- pip install tox
+ pip install tox tox-docker
-As of zuul v3, a running zookeeper is required to execute tests.
+As of zuul v3, a running zookeeper is required to execute tests. Using the
+``-docker`` suffixed commands will ensure this is started automatically by tox,
+but if you do not wish to use this:
*Install zookeeper*::