summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVu Cong Tuan <tuanvc@vn.fujitsu.com>2018-07-03 13:41:51 +0700
committerVu Cong Tuan <tuanvc@vn.fujitsu.com>2018-07-04 08:28:15 +0700
commit0812f94a2367cf16d8379a6432f1a60a46c89616 (patch)
treed5d91b9e94a200d78447f47958b159eb343f46e1
parent70fce414141bf2b18ff6b707c002b0948ddd2ef3 (diff)
downloadoslo-utils-0812f94a2367cf16d8379a6432f1a60a46c89616.tar.gz
Switch to stestr
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: Ica0262653e8c18681d049acca6d5920ac38f97e6
-rw-r--r--.gitignore3
-rw-r--r--.stestr.conf3
-rw-r--r--.testr.conf7
-rw-r--r--lower-constraints.txt4
-rw-r--r--test-requirements.txt2
-rw-r--r--tox.ini2
6 files changed, 8 insertions, 13 deletions
diff --git a/.gitignore b/.gitignore
index baab79c..350e193 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,8 +25,7 @@ pip-log.txt
.coverage
cover
.tox
-nosetests.xml
-.testrepository
+.stestr/
# Translations
*.mo
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 0000000..cf7caa5
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_path=./oslo_utils/tests
+top_path=./
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index 6d83b3c..0000000
--- a/.testr.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-[DEFAULT]
-test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
- OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
- OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
- ${PYTHON:-python} -m subunit.run discover -t ./ . $LISTOPT $IDOPTION
-test_id_option=--load-list $IDFILE
-test_list_option=--list
diff --git a/lower-constraints.txt b/lower-constraints.txt
index ce82d72..81914e2 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -7,6 +7,7 @@ debtcollector==1.2.0
extras==1.0.0
fixtures==3.0.0
flake8==2.5.5
+funcsigs==1.0.0
gitdb==0.6.4
GitPython==1.0.1
hacking==0.12.0
@@ -16,7 +17,6 @@ linecache2==1.0.0
mccabe==0.2.1
mock==2.0.0
monotonic==0.6
-mox3==0.20.0
netaddr==0.7.18
netifaces==0.10.4
os-client-config==1.28.0
@@ -36,8 +36,8 @@ requestsexceptions==1.2.0
rfc3986==0.3.1
six==1.10.0
smmap==0.9.0
+stestr==2.0.0
stevedore==1.20.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 4fff918..22f7e39 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,11 +5,11 @@
hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
fixtures>=3.0.0 # Apache-2.0/BSD
-testrepository>=0.0.18 # Apache-2.0/BSD
testscenarios>=0.4 # Apache-2.0/BSD
testtools>=2.2.0 # MIT
oslotest>=3.2.0 # Apache-2.0
ddt>=1.0.1 # MIT
+stestr>=2.0.0 # Apache-2.0
# when we can require tox>= 1.4, this can go into tox.ini:
# [testenv:cover]
diff --git a/tox.ini b/tox.ini
index 0d719f0..0edd989 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,7 +8,7 @@ deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
-r{toxinidir}/test-requirements.txt
-r{toxinidir}/requirements.txt
-commands = python setup.py testr --slowest --testr-args='{posargs}'
+commands = stestr run --slowest {posargs}
[testenv:py27]
basepython = python2.7