Clean up test requirements

remove os-testr and testrepository in favor of stestr,
and remove qpid-python (does not seem to be imported anywhere).

Also adjust docs to describe running tests with stestr instead of
testrepository.

Change-Id: I12088ea2bf2475963db58d6e8e83fd6abe6f9b3f
This commit is contained in:
Pavlo Shchelokovskyy 2018-06-13 07:48:10 +00:00 committed by Zane Bitter
parent 970bc3bdf4
commit 51f566c56c
3 changed files with 14 additions and 17 deletions

View File

@ -24,22 +24,24 @@ infrastructure in OpenStack Heat, please read heat/tests/testing-overview.txt.
Running tests Running tests
------------- -------------
The testing system is based on a combination of tox and testr. The canonical 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 approach to running tests is to simply run the command ``tox``. This will
create virtual environments, populate them with dependencies and run all of create virtual environments, populate them with dependencies and run all of
the tests that OpenStack CI systems run. Behind the scenes, tox is running 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 ``stestr run``, but is set up such that you can supply any additional
testr arguments that are needed to tox. For example, you can run: stestr arguments that are needed to tox. For example, you can run:
`tox -- --analyze-isolation` to cause tox to tell testr to add ``tox -- --analyze-isolation`` to cause tox to tell stestr to add
--analyze-isolation to its argument list. ``--analyze-isolation`` to its argument list.
It is also possible to run the tests inside of a virtual environment 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 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 installed locally already. In this case, you can interact with the ``stestr``
command directly. Running `testr run` will run the entire test suite. `testr command directly. Running ``stestr run`` will run the entire test suite in
run --parallel` will run it in parallel (this is the default incantation tox as many threads as you have CPU cores (this is the default incantation tox
uses.) More information about testr can be found at: uses), number of threads can be adjusted with ``--concurrency N`` argument.
http://wiki.openstack.org/testr ``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 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 ``tools/test-setup.sh`` on how to set up the databases the same way as

View File

@ -59,7 +59,6 @@ netifaces==0.10.6
openstacksdk==0.11.2 openstacksdk==0.11.2
os-client-config==1.29.0 os-client-config==1.29.0
os-service-types==1.2.0 os-service-types==1.2.0
os-testr==1.0.0
osc-lib==1.10.0 osc-lib==1.10.0
oslo.cache==1.26.0 oslo.cache==1.26.0
oslo.concurrency==3.26.0 oslo.concurrency==3.26.0
@ -126,7 +125,6 @@ python-zaqarclient==1.0.0
python-zunclient==1.3.0 python-zunclient==1.3.0
pytz==2013.6 pytz==2013.6
PyYAML==3.12 PyYAML==3.12
qpid-python==0.26;python_version=='2.7' # Apache-2.0
repoze.lru==0.7 repoze.lru==0.7
requests==2.14.2 requests==2.14.2
requestsexceptions==1.4.0 requestsexceptions==1.4.0
@ -144,7 +142,6 @@ stevedore==1.20.0
tempest==17.1.0 tempest==17.1.0
Tempita==0.5.2 Tempita==0.5.2
tenacity==4.4.0 tenacity==4.4.0
testrepository==0.0.18
testresources==2.0.0 testresources==2.0.0
testscenarios==0.4 testscenarios==0.4
testtools==2.2.0 testtools==2.2.0

View File

@ -11,11 +11,9 @@ kombu!=4.0.2,>=4.0.0 # BSD
mock>=2.0.0 # BSD mock>=2.0.0 # BSD
mox3>=0.20.0 # Apache-2.0 mox3>=0.20.0 # Apache-2.0
PyMySQL>=0.7.6 # MIT License PyMySQL>=0.7.6 # MIT License
os-testr>=1.0.0 # Apache-2.0
oslotest>=3.2.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 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 testscenarios>=0.4 # Apache-2.0/BSD
testtools>=2.2.0 # MIT testtools>=2.2.0 # MIT
testresources>=2.0.0 # Apache-2.0/BSD testresources>=2.0.0 # Apache-2.0/BSD