Skip to content

Commit

Permalink
Switch to stestr
Browse files Browse the repository at this point in the history
According to Openstack summit session [1],
stestr is maintained project to which all Openstack projects should migrate.
Let's switch to stestr as other projects have already moved to it.

[1] https://etherpad.openstack.org/p/YVR-python-pti

Change-Id: Ic098f8560599554e0b6bb16ae326d4d30a8a5504
  • Loading branch information
Vu Cong Tuan committed Nov 5, 2018
1 parent 5b6e382 commit 9acdfe0
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 12 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ dist/
.DS_Store
*.log
.testrepository
.stestr/
subunit.log
build
swiftclient/versioninfo
Expand Down
4 changes: 4 additions & 0 deletions .stestr.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[DEFAULT]
test_path=${OS_TEST_PATH:-./tests/unit}
top_dir=./

4 changes: 0 additions & 4 deletions .testr.conf

This file was deleted.

2 changes: 1 addition & 1 deletion lower-constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ six==1.9.0
snowballstemmer==1.2.1
sphinx==1.6.2
sphinxcontrib-websupport==1.0.1
testrepository==0.0.18
stestr==2.0.0
testtools==2.2.0
traceback2==1.4.0
unittest2==1.1.0
Expand Down
2 changes: 1 addition & 1 deletion test-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ keystoneauth1>=3.4.0 # Apache-2.0
mock>=1.2.0 # BSD
oslosphinx>=4.7.0 # Apache-2.0
sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
testrepository>=0.0.18
stestr>=2.0.0 # Apache-2.0
reno>=2.5.0 # Apache-2.0
openstackdocstheme>=1.18.1 # Apache-2.0
23 changes: 17 additions & 6 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ deps = -r{toxinidir}/requirements.txt
.[keystone]
commands = sh -c '(find . -not \( -type d -name .?\* -prune \) \
\( -type d -name "__pycache__" -or -type f -name "*.py[co]" \) \
-print0; find . -name "*.dbm*" -print0) | xargs -0 rm -rf'
python setup.py testr --testr-args="{posargs}"
-print0) | xargs -0 rm -rf'
stestr run {posargs}
whitelist_externals = sh
passenv = SWIFT_* *_proxy

Expand All @@ -32,17 +32,28 @@ commands = {posargs}

[testenv:cover]
basepython = python3
commands = python setup.py testr --coverage
coverage report
setenv =
PYTHON=coverage run --source swiftclient --parallel-mode
commands =
stestr run
coverage combine
coverage html -d cover
coverage xml -o cover/coverage.xml
coverage report

[testenv:func]
basepython = python3
setenv = OS_TEST_PATH=tests.functional
setenv =
OS_TEST_PATH=tests.functional
PYTHON=coverage run --source swiftclient --parallel-mode
whitelist_externals =
coverage
rm
commands =
python setup.py testr --coverage --testr-args="--concurrency=1"
stestr run --concurrency=1
coverage combine
coverage html -d cover
coverage xml -o cover/coverage.xml
coverage report -m
rm -f .coverage

Expand Down

0 comments on commit 9acdfe0

Please sign in to comment.