diff options
author | Zuul <zuul@review.openstack.org> | 2018-11-05 07:11:31 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2018-11-05 07:11:31 +0000 |
commit | 0ef20fbe009460a492dbd56acb535280973b8c20 (patch) | |
tree | 3177fbdf3db9328fee2efbbc37d42c3d263a6344 | |
parent | e4c70155c8eff3c4d13c0b8669b268a2bbe1443b (diff) | |
parent | 47d2319144dceab0669cb841502d4c9ef819bf1d (diff) | |
download | ceilometermiddleware-0ef20fbe009460a492dbd56acb535280973b8c20.tar.gz |
-rw-r--r-- | .gitignore | 3 | ||||
-rw-r--r-- | .stestr.conf | 4 | ||||
-rw-r--r-- | .testr.conf | 4 | ||||
-rw-r--r-- | test-requirements.txt | 2 | ||||
-rw-r--r-- | tox.ini | 10 |
5 files changed, 14 insertions, 9 deletions
@@ -38,10 +38,9 @@ pip-delete-this-directory.txt # Unit test / coverage reports htmlcov/ .tox/ -.testrepository/ +.stestr/ .coverage .cache -nosetests.xml coverage.xml # Translations diff --git a/.stestr.conf b/.stestr.conf new file mode 100644 index 0000000..a980ee0 --- /dev/null +++ b/.stestr.conf @@ -0,0 +1,4 @@ +[DEFAULT] +test_path=./ceilometermiddleware/tests +top_dir=./ + diff --git a/.testr.conf b/.testr.conf deleted file mode 100644 index c7e817f..0000000 --- a/.testr.conf +++ /dev/null @@ -1,4 +0,0 @@ -[DEFAULT] -test_command=${PYTHON:-python} -m subunit.run discover -t ./ ./ceilometermiddleware/tests $LISTOPT $IDOPTION -test_id_option=--load-list $IDFILE -test_list_option=--list diff --git a/test-requirements.txt b/test-requirements.txt index 18a9dda..7ea25fd 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -8,7 +8,7 @@ sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0 openstackdocstheme>=1.17.0 # Apache-2.0 oslotest>=1.10.0 # Apache-2.0 -testrepository>=0.0.18 # Apache-2.0/BSD +stestr>=2.0.0 # Apache-2.0 mock>=1.2 # BSD reno>=0.1.1 # Apache-2.0 betamax>=0.7.0 # Apache-2.0 @@ -11,7 +11,7 @@ setenv = VIRTUAL_ENV={envdir} deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt -commands = python setup.py testr --slowest --testr-args='{posargs}' +commands = stestr run --slowest {posargs} [testenv:pep8] basepython = python3 @@ -24,7 +24,13 @@ commands = {posargs} [testenv:cover] basepython = python3 -commands = python setup.py testr --coverage --testr-args='{posargs}' +setenv = + PYTHON=coverage run --source $project --parallel-mode +commands = + stestr run '{posargs}' + coverage combine + coverage html -d cover + coverage xml -o cover/coverage.xml [testenv:docs] basepython = python3 |