summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-10-31 15:04:07 +0000
committerGerrit Code Review <review@openstack.org>2018-10-31 15:04:07 +0000
commit5c515e3be5e173b0fa2ab3193b5a9f170d74cf35 (patch)
tree600827c04b554d379c258d98c65dd36b2505bda3
parent933a69baa6d336a12f534b051fd7772ca5cf6b7c (diff)
parent769ed3329b665d12b4516f6939622d80e4b12d25 (diff)
Merge "Switch to using stestr"
-rw-r--r--.gitignore1
-rw-r--r--.stestr.conf3
-rw-r--r--test-requirements.txt2
-rw-r--r--tox.ini2
4 files changed, 6 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index a9621d7..6c4bce4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ tools/lintstack.head.py
5*.egg-info/ 5*.egg-info/
6.tox 6.tox
7.testrepository 7.testrepository
8.stestr
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 0000000..7564a2b
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,3 @@
1[DEFAULT]
2test_path=${OS_TEST_PATH:-./novajoin/tests}
3top_dir=./
diff --git a/test-requirements.txt b/test-requirements.txt
index 5141ba1..a0ff2b4 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -14,7 +14,7 @@ testtools>=2.2.0 # MIT
14testrepository>=0.0.18 # Apache-2.0/BSD 14testrepository>=0.0.18 # Apache-2.0/BSD
15testresources>=2.0.0 # Apache-2.0/BSD 15testresources>=2.0.0 # Apache-2.0/BSD
16testscenarios>=0.4 # Apache-2.0/BSD 16testscenarios>=0.4 # Apache-2.0/BSD
17os-testr>=1.0.0 # Apache-2.0 17stestr>=1.0.0 # Apache-2.0
18tempest>=17.1.0 # Apache-2.0 18tempest>=17.1.0 # Apache-2.0
19bandit>=1.0.1 # Apache-2.0 19bandit>=1.0.1 # Apache-2.0
20sphinx!=1.6.6,>=1.6.2 # BSD 20sphinx!=1.6.6,>=1.6.2 # BSD
diff --git a/tox.ini b/tox.ini
index 522aaa8..74f640b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -21,7 +21,7 @@ deps = -r{toxinidir}/test-requirements.txt
21commands = 21commands =
22 find . -type f -name "*.pyc" -delete 22 find . -type f -name "*.pyc" -delete
23 rm -rf .testrepository/times.dbm 23 rm -rf .testrepository/times.dbm
24 ostestr {posargs} 24 stestr run {posargs}
25 25
26whitelist_externals = 26whitelist_externals =
27 bash 27 bash