summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--.stestr.conf4
-rw-r--r--.testr.conf8
-rw-r--r--test-requirements.txt2
-rw-r--r--tox.ini5
5 files changed, 7 insertions, 14 deletions
diff --git a/.gitignore b/.gitignore
index 0a06d65..3d307b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,7 @@ build/
3*.pyc 3*.pyc
4*.swp 4*.swp
5.venv 5.venv
6.testrepository 6.stestr/
7.tox 7.tox
8 8
9# pbr-generated stuff 9# pbr-generated stuff
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 0000000..90a59c9
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,4 @@
1[DEFAULT]
2test_path=./os_traits/tests
3top_dir=./
4
diff --git a/.testr.conf b/.testr.conf
deleted file mode 100644
index 975a461..0000000
--- a/.testr.conf
+++ /dev/null
@@ -1,8 +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 ./ ${OS_TEST_PATH:-./os_traits/tests} $LISTOPT $IDOPTION
6
7test_id_option=--load-list $IDFILE
8test_list_option=--list
diff --git a/test-requirements.txt b/test-requirements.txt
index 8ad5962..47c128f 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,6 +7,6 @@ hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
7coverage!=4.4,>=4.0 # Apache-2.0 7coverage!=4.4,>=4.0 # Apache-2.0
8python-subunit>=1.0.0 # Apache-2.0/BSD 8python-subunit>=1.0.0 # Apache-2.0/BSD
9oslotest>=3.2.0 # Apache-2.0 9oslotest>=3.2.0 # Apache-2.0
10testrepository>=0.0.18 # Apache-2.0/BSD 10stestr>=2.0.0 # Apache-2.0
11testscenarios>=0.4 # Apache-2.0/BSD 11testscenarios>=0.4 # Apache-2.0/BSD
12testtools>=2.2.0 # MIT 12testtools>=2.2.0 # MIT
diff --git a/tox.ini b/tox.ini
index 26940c9..a0a7ce9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,7 +9,7 @@ whitelist_externals =
9deps = 9deps =
10 -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} 10 -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
11 -r{toxinidir}/test-requirements.txt 11 -r{toxinidir}/test-requirements.txt
12commands = python setup.py testr --slowest --testr-args='{posargs}' 12commands = stestr run --slowest {posargs}
13 13
14[testenv:pep8] 14[testenv:pep8]
15commands = flake8 {posargs} 15commands = flake8 {posargs}
@@ -17,9 +17,6 @@ commands = flake8 {posargs}
17[testenv:venv] 17[testenv:venv]
18commands = {posargs} 18commands = {posargs}
19 19
20[testenv:cover]
21commands = python setup.py test --coverage --testr-args='{posargs}'
22
23[testenv:docs] 20[testenv:docs]
24deps = 21deps =
25 -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} 22 -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}