opendev/system-config
Code Issues Proposed changes

Stop comparing tests counts

Browse Source 
* modules/jenkins/files/slave_scripts/run-tox.sh: This didn't work
reliably, and also becomes very hard to get right between system and
non-system python interpreters. Also undo workarounds we added
earlier in the 983ca11 change.

Change-Id: I48ddfb908b6a7cae9751ecc0c8b7fc56ed5a5e50
This commit is contained in:
Jeremy Stanley 2013-08-02 21:01:26 +00:00
parent 6fcf51e988
commit 309a506c1e
2 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
modules/jenkins/files/slave_scripts/run-tox.sh
View File

@ -59,24 +59,9 @@ if [ -d ".testrepository" ] ; then
elif [ -f ".testrepository/0" ] ; then
cp .testrepository/0 ./subunit_log.txt
fi
export PYTHON=.tox/$venv/bin/python
/usr/local/jenkins/slave_scripts/subunit2html.py ./subunit_log.txt testr_results.html
.tox/$venv/bin/python /usr/local/jenkins/slave_scripts/subunit2html.py ./subunit_log.txt testr_results.html
gzip -9 ./subunit_log.txt
gzip -9 ./testr_results.html
set -e
foundcount=$(.tox/$venv/bin/testr list-tests | sed -e '1d' | wc -l)
rancount=$(.tox/$venv/bin/testr last | sed -ne 's/Ran \([0-9]\+\).*tests in.*/\1/p')
if [ "$rancount" -lt "$foundcount" ] ; then
echo
echo "The number of tests found was greater than the number of tests"
echo "that were run. This indicates a fatal error occured while"
echo "running the tests."
echo "Tests found: $foundcount Tests ran: $rancount"
echo
exit 1
fi
set +e
fi
sudo /usr/local/jenkins/slave_scripts/jenkins-sudo-grep.sh post

2
modules/jenkins/files/slave_scripts/subunit2html.py
View File

@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/python
"""
Utility to convert a subunit stream to an html results file.
Code is adapted from the pyunit Html test runner at