Modify run_tests.sh to just run tox
should fix bug 1203384 Change-Id: Ib37b05067624d7ad1a4516f161514565b088bf6b
This commit is contained in:
Steve Martinelli
parent
0cc5811122
commit
d67524897b
175
run_tests.sh
175
run_tests.sh
@ -1,180 +1,49 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
set -eu
|
|
||||||
|
|
||||||
function usage {
|
function usage {
|
||||||
echo "Usage: $0 [OPTION]..."
|
echo "Usage: $0 [OPTION]..."
|
||||||
echo "Run python-openstackclient test suite"
|
echo "Run python-openstackclient's test suite(s)"
|
||||||
echo ""
|
echo ""
|
||||||
echo " -V, --virtual-env Always use virtualenv. Install automatically if not present"
|
|
||||||
echo " -N, --no-virtual-env Don't use virtualenv. Run tests in local environment"
|
|
||||||
echo " -s, --no-site-packages Isolate the virtualenv from the global Python environment"
|
|
||||||
echo " -f, --force Force a clean re-build of the virtual environment. Useful when dependencies have been added."
|
|
||||||
echo " -p, --pep8 Just run pep8"
|
echo " -p, --pep8 Just run pep8"
|
||||||
echo " -P, --no-pep8 Don't run pep8"
|
|
||||||
echo " -c, --coverage Generate coverage report"
|
|
||||||
echo " -h, --help Print this usage message"
|
echo " -h, --help Print this usage message"
|
||||||
echo ""
|
echo ""
|
||||||
echo "Note: with no options specified, the script will try to run the tests in a virtual environment,"
|
echo "This script is deprecated and currently retained for compatibility."
|
||||||
echo " If no virtualenv is found, the script will ask if you would like to create one. If you "
|
echo 'You can run the full test suite for multiple environments by running "tox".'
|
||||||
echo " prefer to run tests NOT in a virtual environment, simply pass the -N option."
|
echo 'You can run tests for only python 2.7 by running "tox -e py27", or run only'
|
||||||
|
echo 'the pep8 tests with "tox -e pep8".'
|
||||||
exit
|
exit
|
||||||
}
|
}
|
||||||
|
|
||||||
|
command -v tox > /dev/null 2>&1
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
echo 'This script requires "tox" to run.'
|
||||||
|
echo 'You can install it with "pip install tox".'
|
||||||
|
exit 1;
|
||||||
|
fi
|
||||||
|
|
||||||
|
just_pep8=0
|
||||||
|
|
||||||
function process_option {
|
function process_option {
|
||||||
case "$1" in
|
case "$1" in
|
||||||
-h|--help) usage;;
|
-h|--help) usage;;
|
||||||
-V|--virtual-env) always_venv=1; never_venv=0;;
|
-p|--pep8) let just_pep8=1;;
|
||||||
-N|--no-virtual-env) always_venv=0; never_venv=1;;
|
|
||||||
-s|--no-site-packages) no_site_packages=1;;
|
|
||||||
-f|--force) force=1;;
|
|
||||||
-p|--pep8) just_pep8=1;;
|
|
||||||
-P|--no-pep8) no_pep8=1;;
|
|
||||||
-c|--coverage) coverage=1;;
|
|
||||||
-*) testropts="$testropts $1";;
|
|
||||||
*) testrargs="$testrargs $1"
|
|
||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|
||||||
venv=.venv
|
|
||||||
with_venv=tools/with_venv.sh
|
|
||||||
always_venv=0
|
|
||||||
never_venv=0
|
|
||||||
force=0
|
|
||||||
no_site_packages=0
|
|
||||||
installvenvopts=
|
|
||||||
testrargs=
|
|
||||||
testropts=
|
|
||||||
wrapper=""
|
|
||||||
just_pep8=0
|
|
||||||
no_pep8=0
|
|
||||||
coverage=0
|
|
||||||
|
|
||||||
LANG=en_US.UTF-8
|
|
||||||
LANGUAGE=en_US:en
|
|
||||||
LC_ALL=C
|
|
||||||
|
|
||||||
for arg in "$@"; do
|
for arg in "$@"; do
|
||||||
process_option $arg
|
process_option $arg
|
||||||
done
|
done
|
||||||
|
|
||||||
if [ $no_site_packages -eq 1 ]; then
|
|
||||||
installvenvopts="--no-site-packages"
|
|
||||||
fi
|
|
||||||
|
|
||||||
function init_testr {
|
|
||||||
if [ ! -d .testrepository ]; then
|
|
||||||
${wrapper} testr init
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
function run_tests {
|
|
||||||
# Cleanup *.pyc
|
|
||||||
${wrapper} find . -type f -name "*.pyc" -delete
|
|
||||||
|
|
||||||
if [ $coverage -eq 1 ]; then
|
|
||||||
# Do not test test_coverage_ext when gathering coverage.
|
|
||||||
if [ "x$testrargs" = "x" ]; then
|
|
||||||
testrargs="^(?!.*test_coverage_ext).*$"
|
|
||||||
fi
|
|
||||||
export PYTHON="${wrapper} coverage run --source openstackclient --parallel-mode"
|
|
||||||
fi
|
|
||||||
# Just run the test suites in current environment
|
|
||||||
set +e
|
|
||||||
TESTRTESTS="$TESTRTESTS $testrargs"
|
|
||||||
echo "Running \`${wrapper} $TESTRTESTS\`"
|
|
||||||
${wrapper} $TESTRTESTS
|
|
||||||
RESULT=$?
|
|
||||||
set -e
|
|
||||||
|
|
||||||
copy_subunit_log
|
|
||||||
|
|
||||||
return $RESULT
|
|
||||||
}
|
|
||||||
|
|
||||||
function copy_subunit_log {
|
|
||||||
LOGNAME=`cat .testrepository/next-stream`
|
|
||||||
LOGNAME=$(($LOGNAME - 1))
|
|
||||||
LOGNAME=".testrepository/${LOGNAME}"
|
|
||||||
cp $LOGNAME subunit.log
|
|
||||||
}
|
|
||||||
|
|
||||||
function run_pep8 {
|
|
||||||
echo "Running pep8 ..."
|
|
||||||
srcfiles="openstackclient tests setup.py"
|
|
||||||
# Just run PEP8 in current environment
|
|
||||||
#
|
|
||||||
# NOTE(sirp): W602 (deprecated 3-arg raise) is being ignored for the
|
|
||||||
# following reasons:
|
|
||||||
#
|
|
||||||
# 1. It's needed to preserve traceback information when re-raising
|
|
||||||
# exceptions; this is needed b/c Eventlet will clear exceptions when
|
|
||||||
# switching contexts.
|
|
||||||
#
|
|
||||||
# 2. There doesn't appear to be an alternative, "pep8-tool" compatible way of doing this
|
|
||||||
# in Python 2 (in Python 3 `with_traceback` could be used).
|
|
||||||
#
|
|
||||||
# 3. Can find no corroborating evidence that this is deprecated in Python 2
|
|
||||||
# other than what the PEP8 tool claims. It is deprecated in Python 3, so,
|
|
||||||
# perhaps the mistake was thinking that the deprecation applied to Python 2
|
|
||||||
# as well.
|
|
||||||
pep8_opts="--ignore=E126,E202,W602 --repeat"
|
|
||||||
${wrapper} pep8 ${pep8_opts} ${srcfiles}
|
|
||||||
}
|
|
||||||
|
|
||||||
TESTRTESTS="testr run --parallel $testropts"
|
|
||||||
|
|
||||||
if [ $never_venv -eq 0 ]
|
|
||||||
then
|
|
||||||
# Remove the virtual environment if --force used
|
|
||||||
if [ $force -eq 1 ]; then
|
|
||||||
echo "Cleaning virtualenv..."
|
|
||||||
rm -rf ${venv}
|
|
||||||
fi
|
|
||||||
if [ -e ${venv} ]; then
|
|
||||||
wrapper="${with_venv}"
|
|
||||||
else
|
|
||||||
if [ $always_venv -eq 1 ]; then
|
|
||||||
# Automatically install the virtualenv
|
|
||||||
python tools/install_venv.py $installvenvopts
|
|
||||||
wrapper="${with_venv}"
|
|
||||||
else
|
|
||||||
echo -e "No virtual environment found...create one? (Y/n) \c"
|
|
||||||
read use_ve
|
|
||||||
if [ "x$use_ve" = "xY" -o "x$use_ve" = "x" -o "x$use_ve" = "xy" ]; then
|
|
||||||
# Install the virtualenv and run the test suite in it
|
|
||||||
python tools/install_venv.py $installvenvopts
|
|
||||||
wrapper=${with_venv}
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Delete old coverage data from previous runs
|
|
||||||
if [ $coverage -eq 1 ]; then
|
|
||||||
${wrapper} coverage erase
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ $just_pep8 -eq 1 ]; then
|
if [ $just_pep8 -eq 1 ]; then
|
||||||
run_pep8
|
exec tox -e pep8
|
||||||
exit
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
init_testr
|
tox -e py27 $toxargs 2>&1 | tee run_tests.err.log || exit 1
|
||||||
run_tests
|
tox_exit_code=${PIPESTATUS[0]}
|
||||||
|
if [ 0$tox_exit_code -ne 0 ]; then
|
||||||
# NOTE(sirp): we only want to run pep8 when we're running the full-test suite,
|
exit $tox_exit_code
|
||||||
# not when we're running tests individually. To handle this, we need to
|
|
||||||
# distinguish between options (noseopts), which begin with a '-', and
|
|
||||||
# arguments (testrargs).
|
|
||||||
if [ -z "$testrargs" ]; then
|
|
||||||
if [ $no_pep8 -eq 0 ]; then
|
|
||||||
run_pep8
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ $coverage -eq 1 ]; then
|
if [ -z "$toxargs" ]; then
|
||||||
echo "Generating coverage report in covhtml/"
|
tox -e pep8
|
||||||
${wrapper} coverage combine
|
|
||||||
${wrapper} coverage html --include='openstackclient/*' --omit='openstackclient/openstack/common/*' -d covhtml -i
|
|
||||||
fi
|
fi
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user