summaryrefslogtreecommitdiff
path: root/CONTRIBUTING.rst
diff options
context:
space:
mode:
Diffstat (limited to 'CONTRIBUTING.rst')
-rw-r--r--CONTRIBUTING.rst19
1 files changed, 9 insertions, 10 deletions
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 9b43ec7..7877dce 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -20,13 +20,13 @@ tools, or review ``bindep.txt`` by hand.
Running Tests
-------------
-The testing system is based on a combination of tox and testr. The canonical
-approach to running tests is to simply run the command `tox`. This will
+The testing system is based on a combination of nox and testr. The canonical
+approach to running tests is to simply run the command `nox`. This will
create virtual environments, populate them with dependencies and run all of
-the tests that OpenStack CI systems run. Behind the scenes, tox is running
-`testr run --parallel`, but is set up such that you can supply any additional
-testr arguments that are needed to tox. For example, you can run:
-`tox -- --analyze-isolation` to cause tox to tell testr to add
+the tests that OpenStack CI systems run. Behind the scenes, nox is running
+`stestr run`, but is set up such that you can supply any additional
+stestr arguments that are needed to nox. For example, you can run:
+`nox -s tests -- --analyze-isolation` to cause nox to tell testr to add
--analyze-isolation to its argument list.
It is also possible to run the tests inside of a virtual environment
@@ -38,7 +38,6 @@ test-requirements.txt. Installing them via pip, for instance, is simply::
pip install -r requirements.txt -r test-requirements.txt
In you go this route, you can interact with the testr command directly.
-Running `testr run` will run the entire test suite. `testr run --parallel`
-will run it in parallel (this is the default incantation tox uses.) More
-information about testr can be found at:
-https://testrepository.readthedocs.io/en/latest/
+Running `stestr run` will run the entire test suite.
+More information about testr can be found at:
+https://stestr.readthedocs.io/en/latest/README.html