Merge "Use pretty-tox for better test output"

test-requirements.txt

@@ -3,14 +3,16 @@
 # process, which may cause wedges in the gate later.
 
 hacking>=0.10.0,<0.11
+
 coverage>=3.6
-mock>=1.0
 discover
-oslosphinx>=2.2.0  # Apache-2.0
-testrepository>=0.0.18
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
-python-swiftclient>=2.2.0
-python-novaclient>=2.18.0
-python-neutronclient>=2.3.6,<3
+mock>=1.0
 oslo.config>=1.6.0  # Apache-2.0
+oslosphinx>=2.2.0  # Apache-2.0
+python-neutronclient>=2.3.6,<3
+python-novaclient>=2.18.0
+python-swiftclient>=2.2.0
 requests-mock>=0.5.1 # Apache-2.0
+sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
+tempest-lib>=0.1.0
+testrepository>=0.0.18

tools/pretty_tox.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -o pipefail
+
+TESTRARGS=$1
+python setup.py testr --slowest --testr-args="--subunit $TESTRARGS" | subunit-trace -f

tox.ini

@@ -13,13 +13,14 @@ setenv =
 deps =
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/test-requirements.txt
-commands = python setup.py test --slowest --testr-args="{posargs}"
+commands = bash tools/pretty_tox.sh "{posargs}"
+whitelist_externals = bash
 
 [testenv:integration]
 setenv =
     VIRTUAL_ENV={envdir}
     DISCOVER_DIRECTORY=saharaclient/tests/integration/
-commands = python setup.py test --slowest --testr-args="{posargs}"
+commands = bash tools/pretty_tox.sh "{posargs}"
 
 [testenv:cover]
 commands = python setup.py test --coverage --testr-args='{posargs}'