Merge "Clean up test requirements"

3 files changed, 14 insertions, 17 deletions

diff --git a/HACKING.rst b/HACKING.rst
index 9b0cadee5..618cfa309 100644
--- a/HACKING.rst
+++ b/HACKING.rst
@@ -24,22 +24,24 @@ infrastructure in OpenStack Heat, please read heat/tests/testing-overview.txt.
 
 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 tox and stestr. The canonical
+approach to running tests is to simply run the command ``tox``. 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
---analyze-isolation to its argument list.
+``stestr run``, but is set up such that you can supply any additional
+stestr arguments that are needed to tox. For example, you can run:
+``tox -- --analyze-isolation`` to cause tox to tell stestr to add
+``--analyze-isolation`` to its argument list.
 
 It is also possible to run the tests inside of a virtual environment
 you have created, or it is possible that you have all of the dependencies
-installed locally already. In this case, 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:
-http://wiki.openstack.org/testr
+installed locally already. In this case, you can interact with the ``stestr``
+command directly. Running ``stestr run`` will run the entire test suite in
+as many threads as you have CPU cores (this is the default incantation tox
+uses), number of threads can be adjusted with ``--concurrency N`` argument.
+``testr run --serial`` will run tests in serial process.
+More information about stestr can be found at:
+http://stestr.readthedocs.io
 
 Note that unit tests use a database if available. See
 ``tools/test-setup.sh`` on how to set up the databases the same way as
diff --git a/lower-constraints.txt b/lower-constraints.txt
index f4009ce53..97b759c52 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -60,7 +60,6 @@ neutron-lib==1.14.0
 openstacksdk==0.11.2
 os-client-config==1.29.0
 os-service-types==1.2.0
-os-testr==1.0.0
 osc-lib==1.10.0
 oslo.cache==1.26.0
 oslo.concurrency==3.26.0
@@ -128,7 +127,6 @@ python-zaqarclient==1.0.0
 python-zunclient==2.0.0
 pytz==2013.6
 PyYAML==3.12
-qpid-python==0.26;python_version=='2.7' # Apache-2.0
 repoze.lru==0.7
 requests==2.14.2
 requestsexceptions==1.4.0
@@ -146,7 +144,6 @@ stevedore==1.20.0
 tempest==17.1.0
 Tempita==0.5.2
 tenacity==4.4.0
-testrepository==0.0.18
 testresources==2.0.0
 testscenarios==0.4
 testtools==2.2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 07d544c27..4500a40b8 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -10,11 +10,9 @@ fixtures>=3.0.0 # Apache-2.0/BSD
 kombu!=4.0.2,>=4.0.0 # BSD
 mock>=2.0.0 # BSD
 PyMySQL>=0.7.6 # MIT License
-os-testr>=1.0.0 # Apache-2.0
 oslotest>=3.2.0 # Apache-2.0
-qpid-python>=0.26;python_version=='2.7' # Apache-2.0
 psycopg2>=2.6.2 # LGPL/ZPL
-testrepository>=0.0.18 # Apache-2.0/BSD
+stestr>=2.0.0 # Apache-2.0
 testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
 testresources>=2.0.0 # Apache-2.0/BSD