diff --git a/.gitignore b/.gitignore index 6bd90a35a..1a6fed716 100644 --- a/.gitignore +++ b/.gitignore @@ -53,6 +53,7 @@ ChangeLog !/.mailmap !/.pylintrc !/.testr.conf +!/.stestr.conf contrib/vagrant/.vagrant diff --git a/.stestr.conf b/.stestr.conf new file mode 100644 index 000000000..117657f2e --- /dev/null +++ b/.stestr.conf @@ -0,0 +1,3 @@ +[DEFAULT] +test_path=${OS_TEST_PATH:-./kuryr_kubernetes/tests/} +top_dir=./ diff --git a/lower-constraints.txt b/lower-constraints.txt index 72ad5f11a..dc1501176 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -119,7 +119,7 @@ SQLAlchemy==1.2.5 sqlalchemy-migrate==0.11.0 sqlparse==0.2.4 statsd==3.2.2 -stestr==2.0.0 +stestr==1.0.0 stevedore==1.20.0 Tempita==0.5.2 tenacity==4.9.0 diff --git a/test-requirements.txt b/test-requirements.txt index 5f97901c1..ffb5526b7 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -9,7 +9,7 @@ ddt>=1.0.1 # MIT docutils>=0.11 # OSI-Approved Open Source, Public Domain mock>=2.0.0 # BSD python-subunit>=1.0.0 # Apache-2.0/BSD -os-testr>=1.0.0 # Apache-2.0 +stestr>=1.0.0 # Apache-2.0 oslotest>=3.2.0 # Apache-2.0 testrepository>=0.0.18 # Apache-2.0/BSD testscenarios>=0.4 # Apache-2.0/BSD diff --git a/tox.ini b/tox.ini index 948f83782..6de8a3295 100644 --- a/tox.ini +++ b/tox.ini @@ -14,7 +14,7 @@ whitelist_externals = sh rm commands = find {toxinidir} -type f -name "*.py[c|o]" -delete rm -f .testrepository/times.dbm - ostestr '{posargs}' + stestr run '{posargs}' [testenv:fullstack] basepython = python2.7