diff options
| author | Zuul <zuul@review.openstack.org> | 2018-07-30 10:55:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-07-30 10:55:48 +0000 |
| commit | 97327589468b96bad27b98a073953ed66b78969f (patch) | |
| tree | dee3e624a4261186d6180b018d8b44e36f2f6a66 | |
| parent | b5f3d34cd009445de9a6489828faad7ec624a1a6 (diff) | |
| parent | 09475c2c1d7398b29342fb66747ecce1db7aad29 (diff) | |
| download | python-heatclient-97327589468b96bad27b98a073953ed66b78969f.tar.gz | |
Merge "Switch to stestr"
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | .stestr.conf | 3 | ||||
| -rw-r--r-- | .testr.conf | 4 | ||||
| -rw-r--r-- | lower-constraints.txt | 3 | ||||
| -rw-r--r-- | test-requirements.txt | 2 | ||||
| -rw-r--r-- | tox.ini | 9 |
6 files changed, 13 insertions, 10 deletions
@@ -16,7 +16,7 @@ doc/build heatclient/versioninfo *.egg-info *.log -.testrepository +.stestr/ # Files created by releasenotes build releasenotes/build diff --git a/.stestr.conf b/.stestr.conf new file mode 100644 index 0000000..eb18d61 --- /dev/null +++ b/.stestr.conf @@ -0,0 +1,3 @@ +[DEFAULT] +test_path=${OS_TEST_PATH:-./heatclient/tests/unit} +top_dir=./ diff --git a/.testr.conf b/.testr.conf deleted file mode 100644 index 6e77f6b..0000000 --- a/.testr.conf +++ /dev/null @@ -1,4 +0,0 @@ -[DEFAULT] -test_command=${PYTHON:-python} -m subunit.run discover -t ./ ${OS_TEST_PATH:-./heatclient/tests/unit} $LISTOPT $IDOPTION -test_id_option=--load-list $IDFILE -test_list_option=--list diff --git a/lower-constraints.txt b/lower-constraints.txt index 02fa291..8a1c4ee 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -85,10 +85,9 @@ six==1.10.0 snowballstemmer==1.2.1 Sphinx==1.6.2 sphinxcontrib-websupport==1.0.1 -stestr==1.0.0 +stestr==2.0.0 stevedore==1.20.0 tempest==17.1.0 -testrepository==0.0.18 testscenarios==0.4 testtools==2.2.0 traceback2==1.4.0 diff --git a/test-requirements.txt b/test-requirements.txt index 5fb01ef..39cdce8 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -10,7 +10,7 @@ requests-mock>=1.2.0 # Apache-2.0 mock>=2.0.0 # BSD mox3>=0.20.0 # Apache-2.0 python-openstackclient>=3.12.0 # Apache-2.0 +stestr>=2.0.0 # Apache-2.0 tempest>=17.1.0 # Apache-2.0 -testrepository>=0.0.18 # Apache-2.0/BSD testscenarios>=0.4 # Apache-2.0/BSD testtools>=2.2.0 # MIT @@ -13,7 +13,7 @@ deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands = find . -type f -name "*.py[c|o]" -delete - python setup.py testr --slowest --testr-args='{posargs}' + stestr run --slowest {posargs} whitelist_externals = find [testenv:debug] @@ -45,8 +45,13 @@ passenv = OS_* [testenv:cover] basepython = python3 +setenv = + PYTHON=coverage run --source heatclient --parallel-mode commands = - python setup.py testr --coverage --testr-args='{posargs}' + stestr run '{posargs}' + coverage combine + coverage html -d cover + coverage xml -o cover/coverage.xml coverage report [testenv:docs] |