summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVu Cong Tuan <tuanvc@vn.fujitsu.com>2018-07-10 15:54:11 +0700
committerVu Cong Tuan <tuanvc@vn.fujitsu.com>2018-07-10 18:41:32 +0700
commita2091f9c65d9d9a22118d0c5cd5ebbe0aab7763b (patch)
tree67aad563fd2204b5cdfc16e92863797fa81e536f
parent06740f9c6b58a55a936386e9e7b8f6e7d710feb3 (diff)
Switch to stestr9.1.0
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: I99bef7040974e193bc5a57f6f5a7dd7fe293519d
Notes
Notes (review): Code-Review+2: Emilien Macchi <emilien@redhat.com> Code-Review+2: Steve Baker <sbaker@redhat.com> Workflow+1: Steve Baker <sbaker@redhat.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Thu, 09 Aug 2018 10:04:56 +0000 Reviewed-on: https://review.openstack.org/581266 Project: openstack/os-refresh-config Branch: refs/heads/master
-rw-r--r--.gitignore3
-rw-r--r--.stestr.conf4
-rw-r--r--.testr.conf4
-rw-r--r--test-requirements.txt2
-rw-r--r--tox.ini9
5 files changed, 13 insertions, 9 deletions
diff --git a/.gitignore b/.gitignore
index 161c8b7..f851eff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,9 +24,8 @@ pip-log.txt
24# Unit test / coverage reports 24# Unit test / coverage reports
25.coverage 25.coverage
26cover 26cover
27.testrepository 27.stestr/
28.tox 28.tox
29nosetests.xml
30 29
31# Translations 30# Translations
32*.mo 31*.mo
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 0000000..7e7d325
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,4 @@
1[DEFAULT]
2test_path=./os_refresh_config/tests
3top_dir=./
4
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index a2ff14b..0000000
--- a/.testr.conf
+++ /dev/null
@@ -1,4 +0,0 @@
1[DEFAULT]
2test_command=${PYTHON:-python} -m subunit.run discover -t ./ . $LISTOPT $IDOPTION
3test_id_option=--load-list $IDFILE
4test_list_option=--list
diff --git a/test-requirements.txt b/test-requirements.txt
index b5cbcf5..e948423 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -8,6 +8,6 @@ fixtures>=3.0.0 # Apache-2.0/BSD
8mock>=2.0.0 # BSD 8mock>=2.0.0 # BSD
9python-subunit>=1.0.0 # Apache-2.0/BSD 9python-subunit>=1.0.0 # Apache-2.0/BSD
10sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD 10sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
11testrepository>=0.0.18 # Apache-2.0/BSD 11stestr>=2.0.0 # Apache-2.0
12testscenarios>=0.4 # Apache-2.0/BSD 12testscenarios>=0.4 # Apache-2.0/BSD
13testtools>=2.2.0 # MIT 13testtools>=2.2.0 # MIT
diff --git a/tox.ini b/tox.ini
index 329d416..35f9cc2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,7 +11,7 @@ deps =
11 -r{toxinidir}/test-requirements.txt 11 -r{toxinidir}/test-requirements.txt
12install_command = pip install {opts} {packages} 12install_command = pip install {opts} {packages}
13commands = 13commands =
14 python setup.py testr --slowest --testr-args='{posargs}' 14 stestr run --slowest {posargs}
15 15
16[tox:jenkins] 16[tox:jenkins]
17sitepackages = True 17sitepackages = True
@@ -20,8 +20,13 @@ sitepackages = True
20commands = flake8 20commands = flake8
21 21
22[testenv:cover] 22[testenv:cover]
23setenv =
24 PYTHON=coverage run --source os_refresh_config --parallel-mode
23commands = 25commands =
24 python setup.py test --coverage --coverage-package-name=os_refresh_config 26 stestr run '{posargs}'
27 coverage combine
28 coverage html -d cover
29 coverage xml -o cover/coverage.xml
25 30
26[testenv:venv] 31[testenv:venv]
27commands = {posargs} 32commands = {posargs}