summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-09-15 23:13:49 +0000
committerGerrit Code Review <review@openstack.org>2017-09-15 23:13:49 +0000
commit40a0ce5c94fde68fd001623f545197bba4203dfe (patch)
treeb585a59ae85159f3b5d348cbc3d88245b77541ef
parent12552cee707da63a5f76adab5e16b34d738b027a (diff)
parent7274e8efe620b076bfeb8f69e9a94a44b064cfb0 (diff)
downloadpython-openstackclient-40a0ce5c94fde68fd001623f545197bba4203dfe.tar.gz
Merge "Updates for stestr"
-rw-r--r--.gitignore1
-rw-r--r--.stestr.conf4
-rw-r--r--tox.ini3
3 files changed, 8 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 2c0139cf..54cdd4fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@
*~
.coverage
.idea
+.stestr/
.testrepository
.tox
AUTHORS
diff --git a/.stestr.conf b/.stestr.conf
new file mode 100644
index 00000000..75aec670
--- /dev/null
+++ b/.stestr.conf
@@ -0,0 +1,4 @@
+[DEFAULT]
+test_path=${OS_TEST_PATH:-./openstackclient/tests/unit}
+top_dir=./
+group_regex=([^\.]+\.)+
diff --git a/tox.ini b/tox.ini
index 7716ffb4..3c1b3c38 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,6 +8,9 @@ usedevelop = True
install_command =
{toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
setenv = VIRTUAL_ENV={envdir}
+ OS_STDOUT_CAPTURE=1
+ OS_STDERR_CAPTURE=1
+ OS_TEST_TIMEOUT=60
deps = -r{toxinidir}/test-requirements.txt
commands = ostestr {posargs}
whitelist_externals = ostestr