summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVu Cong Tuan <tuanvc@vn.fujitsu.com>2018-07-02 14:00:42 +0700
committerVu Cong Tuan <tuanvc@vn.fujitsu.com>2018-07-04 08:18:31 +0700
commita9d728b71e47540fd248a6bc2d301fdfa9a988ce (patch)
treec1c66b2ada093af229918c5a3bf87abe001f0a4b
parent0b9a94376bc9202062ec94af0887c8ee492b52ab (diff)
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: I753f32ecf3275cf49d8c93bf648a6a26bc6da8e7
Notes
Notes (review): Code-Review+2: Stephen Finucane <stephenfin@redhat.com> Workflow+1: Stephen Finucane <stephenfin@redhat.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Wed, 04 Jul 2018 12:06:39 +0000 Reviewed-on: https://review.openstack.org/579467 Project: openstack/oslo.concurrency Branch: refs/heads/master
-rw-r--r--.gitignore3
-rw-r--r--.stestr.conf3
-rw-r--r--.testr.conf7
-rw-r--r--lower-constraints.txt2
-rw-r--r--oslo_concurrency/lockutils.py2
-rw-r--r--test-requirements.txt1
-rw-r--r--tox.ini4
7 files changed, 9 insertions, 13 deletions
diff --git a/.gitignore b/.gitignore
index baab79c..fe20fb6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,8 +25,7 @@ pip-log.txt
25.coverage 25.coverage
26cover 26cover
27.tox 27.tox
28nosetests.xml 28.stestr
29.testrepository
30 29
31# Translations 30# Translations
32*.mo 31*.mo
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 0000000..25c7145
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
1[DEFAULT]
2test_path=./oslo_concurrency/tests/unit
3top_path=./
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index fb62267..0000000
--- a/.testr.conf
+++ /dev/null
@@ -1,7 +0,0 @@
1[DEFAULT]
2test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
3 OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
4 OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
5 ${PYTHON:-python} -m subunit.run discover -t ./ . $LISTOPT $IDOPTION
6test_id_option=--load-list $IDFILE
7test_list_option=--list \ No newline at end of file
diff --git a/lower-constraints.txt b/lower-constraints.txt
index f917ff5..a42f65e 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -54,7 +54,7 @@ snowballstemmer==1.2.1
54Sphinx==1.6.2 54Sphinx==1.6.2
55sphinxcontrib-websupport==1.0.1 55sphinxcontrib-websupport==1.0.1
56stevedore==1.20.0 56stevedore==1.20.0
57testrepository==0.0.18 57stestr==2.0.0
58testtools==2.2.0 58testtools==2.2.0
59traceback2==1.4.0 59traceback2==1.4.0
60unittest2==1.1.0 60unittest2==1.1.0
diff --git a/oslo_concurrency/lockutils.py b/oslo_concurrency/lockutils.py
index e896a1a..87db4ce 100644
--- a/oslo_concurrency/lockutils.py
+++ b/oslo_concurrency/lockutils.py
@@ -348,7 +348,7 @@ def _lock_wrapper(argv):
348 lockutils-wrapper 348 lockutils-wrapper
349 349
350 If you run this: 350 If you run this:
351 lockutils-wrapper python setup.py testr <etc> 351 lockutils-wrapper stestr run <etc>
352 352
353 a temporary directory will be created for all your locks and passed to all 353 a temporary directory will be created for all your locks and passed to all
354 your tests in an environment variable. The temporary dir will be deleted 354 your tests in an environment variable. The temporary dir will be deleted
diff --git a/test-requirements.txt b/test-requirements.txt
index a6f68de..fb68ff2 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,6 +7,7 @@ oslotest>=3.2.0 # Apache-2.0
7coverage!=4.4,>=4.0 # Apache-2.0 7coverage!=4.4,>=4.0 # Apache-2.0
8futures>=3.0.0;python_version=='2.7' or python_version=='2.6' # BSD 8futures>=3.0.0;python_version=='2.7' or python_version=='2.6' # BSD
9fixtures>=3.0.0 # Apache-2.0/BSD 9fixtures>=3.0.0 # Apache-2.0/BSD
10stestr>=2.0.0 # Apache-2.0
10 11
11# These are needed for docs generation 12# These are needed for docs generation
12openstackdocstheme>=1.18.1 # Apache-2.0 13openstackdocstheme>=1.18.1 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 0447e70..7ac6bee 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,8 +10,8 @@ deps =
10 -r{toxinidir}/requirements.txt 10 -r{toxinidir}/requirements.txt
11# We want to support both vanilla stdlib and eventlet monkey patched 11# We want to support both vanilla stdlib and eventlet monkey patched
12commands = 12commands =
13 lockutils-wrapper python setup.py testr --slowest --testr-args='{posargs}' 13 lockutils-wrapper stestr run --slowest {posargs}
14 env TEST_EVENTLET=1 lockutils-wrapper python setup.py testr --slowest --testr-args='{posargs}' 14 env TEST_EVENTLET=1 lockutils-wrapper stestr run --slowest {posargs}
15 15
16[testenv:py27] 16[testenv:py27]
17basepython = python2.7 17basepython = python2.7