Skip to content

Commit

Permalink
Replace ostestr with stestr in testing framework.
Browse files Browse the repository at this point in the history
A system upgrade broke ostestr. We can fix it by just calling stestr
directly.

Change-Id: Iaa340623e414929cfa10897972bdb40d8bb39724
  • Loading branch information
pengale committed Mar 7, 2019
1 parent 9763919 commit df39cd6
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 11 deletions.
3 changes: 3 additions & 0 deletions .stestr.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[DEFAULT]
test_path=./unit_tests
top_dir=./
8 changes: 0 additions & 8 deletions .testr.conf

This file was deleted.

2 changes: 1 addition & 1 deletion test-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ charm-tools>=2.4.4
coverage>=3.6
mock>=1.2
flake8>=2.2.4,<=2.4.1
os-testr>=0.4.1
stestr>=2.2.0
requests>=2.18.4
# BEGIN: Amulet OpenStack Charm Helper Requirements
# Liberty client lower constraints
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ setenv = VIRTUAL_ENV={envdir}
AMULET_SETUP_TIMEOUT=5400
install_command =
pip install {opts} {packages}
commands = ostestr {posargs}
commands = stestr run {posargs}
whitelist_externals = juju
passenv = HOME TERM AMULET_* CS_API_*

Expand Down Expand Up @@ -49,7 +49,7 @@ setenv =
PYTHON=coverage run
commands =
coverage erase
ostestr {posargs}
stestr run {posargs}
coverage combine
coverage html -d cover
coverage xml -o cover/coverage.xml
Expand Down

0 comments on commit df39cd6

Please sign in to comment.