openstack
/
nova
Code Issues Proposed changes

Merge "Fix run_tests.sh usage of tools/colorizer.py."

This commit is contained in:
Jenkins 2013-05-14 07:31:47 +00:00 committed by Gerrit Code Review
parent 8b1b2acca6 7f262c5ae2
commit dee983592f
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
run_tests.sh
View File

@ -141,7 +141,14 @@ function run_tests {
${wrapper} python setup.py egg_info
fi
echo "Running \`${wrapper} $TESTRTESTS\`"
bash -c "${wrapper} $TESTRTESTS | ${wrapper} tools/colorizer.py"
if ${wrapper} which subunit-2to1 2>&1 > /dev/null
then
# subunit-2to1 is present, testr subunit stream should be in version 2
# format. Convert to version one before colorizing.
bash -c "${wrapper} $TESTRTESTS | ${wrapper} subunit-2to1 | ${wrapper} tools/colorizer.py"
else
bash -c "${wrapper} $TESTRTESTS | ${wrapper} tools/colorizer.py"
fi
RESULT=$?
set -e