summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-02-05 12:24:33 +0000
committerGerrit Code Review <review@openstack.org>2015-02-05 12:24:33 +0000
commit5dbe836e7b3627a9690cce8cd6dd837fbd8e6b1c (patch)
treee03e466edae6b4be8868c5c196c6aebc3dacbcc9
parenta8ec072b8daa6515995f6910d7f1802bf22f9a78 (diff)
parent165a3873ddba11af43b03397a4b1a035da970662 (diff)
downloaddesignate-5dbe836e7b3627a9690cce8cd6dd837fbd8e6b1c.tar.gz
Merge "Add pretty_tox subunit wrapper"2015.1.0b2
-rw-r--r--test-requirements.txt1
-rwxr-xr-xtools/pretty_tox.sh6
-rw-r--r--tox.ini4
3 files changed, 10 insertions, 1 deletions
diff --git a/test-requirements.txt b/test-requirements.txt
index 2166ade5..217ccd7d 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -17,3 +17,4 @@ testtools>=0.9.36,!=1.2.0
testrepository>=0.0.18
testscenarios>=0.4
WebTest>=2.0
+tempest-lib>=0.1.0
diff --git a/tools/pretty_tox.sh b/tools/pretty_tox.sh
new file mode 100755
index 00000000..0fc36053
--- /dev/null
+++ b/tools/pretty_tox.sh
@@ -0,0 +1,6 @@
+#! /bin/sh
+
+TESTRARGS=$1
+
+exec 3>&1
+status=$(exec 4>&1 >&3; ( python setup.py testr --slowest --testr-args="--subunit $TESTRARGS"; echo $? >&4 ) | subunit-trace -f) && exit $status
diff --git a/tox.ini b/tox.ini
index 2a525db6..c20188bb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,7 +14,9 @@ deps = -r{toxinidir}/requirements.txt
# Note the hash seed is set to 0 until designate can be tested with a
# random hash seed successfully.
setenv = PYTHONHASHSEED=0
-commands = python setup.py testr --slowest --testr-args='{posargs}'
+whitelist_externals = sh
+commands =
+ sh tools/pretty_tox.sh '{posargs}'
[testenv:cover]
commands = python setup.py testr --coverage --testr-args='{posargs}'