Remove virtualenv management scripts from oslo-incubator
This commit removes the old virtualenv management scripts from oslo incubator. They were just wrappers around virtualenv and don't really work well in a world with global requirements and constraints. This commit just removes them since there isn't any reasons to keep them around and remove references to run_tests.sh in the TESTING.rst file Closes-Bug: #1553722 Co-Authored-By: lei.lu@easystack.cn Change-Id: Ieae3698db85377b52687dac58f33a571bc179956
This commit is contained in:
caoyue
Lu lei
parent
d1903f53b3
commit
c93ea2f811
45
TESTING.rst
45
TESTING.rst
@ -27,10 +27,10 @@ current tests should be passing.
|
|||||||
Running unit tests
|
Running unit tests
|
||||||
------------------
|
------------------
|
||||||
|
|
||||||
There are three mechanisms for running tests: run_tests.sh, tox,
|
There are two mechanisms for running tests: tox and nose. Before
|
||||||
and nose. Before submitting a patch for review you should always
|
submitting a patch for review you should always ensure all test pass;
|
||||||
ensure all test pass; a tox run is triggered by the jenkins gate
|
a tox run is triggered by the jenkins gate executed on gerrit for
|
||||||
executed on gerrit for each patch pushed for review.
|
each patch pushed for review.
|
||||||
|
|
||||||
With these mechanisms you can either run the tests in the standard
|
With these mechanisms you can either run the tests in the standard
|
||||||
environment or create a virtual environment to run them in.
|
environment or create a virtual environment to run them in.
|
||||||
@ -39,15 +39,6 @@ By default after running all of the tests, any pep8 errors
|
|||||||
found in the tree will be reported.
|
found in the tree will be reported.
|
||||||
|
|
||||||
|
|
||||||
With `run_tests.sh`
|
|
||||||
~~~~~~~~~~~~~~~~~~~
|
|
||||||
|
|
||||||
You can use the `run_tests.sh` script in the root source directory to execute
|
|
||||||
tests in a virtualenv::
|
|
||||||
|
|
||||||
./run_tests.sh -V
|
|
||||||
|
|
||||||
|
|
||||||
With `nose`
|
With `nose`
|
||||||
~~~~~~~~~~~
|
~~~~~~~~~~~
|
||||||
|
|
||||||
@ -108,31 +99,11 @@ class separating it from the module path with a colon.
|
|||||||
For example, the following would run only the TestVNFMPlugin tests from
|
For example, the following would run only the TestVNFMPlugin tests from
|
||||||
tacker/tests/unit/vm/test_plugin.py::
|
tacker/tests/unit/vm/test_plugin.py::
|
||||||
|
|
||||||
$ ./run_tests.sh tacker.tests.unit.vm.test_plugin:TestVNFMPlugin
|
|
||||||
|
|
||||||
or::
|
|
||||||
|
|
||||||
$ ./tox tacker.tests.unit.vm.test_plugin:TestVNFMPlugin
|
$ ./tox tacker.tests.unit.vm.test_plugin:TestVNFMPlugin
|
||||||
|
|
||||||
Adding more tests
|
|
||||||
~~~~~~~~~~~~~~~~~
|
|
||||||
|
|
||||||
Tacker has a fast growing code base and there is plenty of areas that
|
|
||||||
need to be covered by unit and functional tests.
|
|
||||||
|
|
||||||
To get a grasp of the areas where tests are needed, you can check
|
|
||||||
current coverage by running::
|
|
||||||
|
|
||||||
$ ./run_tests.sh -c
|
|
||||||
|
|
||||||
Debugging
|
Debugging
|
||||||
---------
|
---------
|
||||||
|
|
||||||
By default, calls to pdb.set_trace() will be ignored when tests
|
|
||||||
are run. For pdb statements to work, invoke run_tests as follows::
|
|
||||||
|
|
||||||
$ ./run_tests.sh -d [test module path]
|
|
||||||
|
|
||||||
It's possible to debug tests in a tox environment::
|
It's possible to debug tests in a tox environment::
|
||||||
|
|
||||||
$ tox -e venv -- python -m testtools.run [test module path]
|
$ tox -e venv -- python -m testtools.run [test module path]
|
||||||
@ -155,11 +126,3 @@ that the source tree be installed in the venv in editable mode::
|
|||||||
Editable mode ensures that changes made to the source tree are
|
Editable mode ensures that changes made to the source tree are
|
||||||
automatically reflected in the venv, and that such changes are not
|
automatically reflected in the venv, and that such changes are not
|
||||||
overwritten during the next tox run.
|
overwritten during the next tox run.
|
||||||
|
|
||||||
Post-mortem debugging
|
|
||||||
~~~~~~~~~~~~~~~~~~~~~
|
|
||||||
|
|
||||||
Setting OS_POST_MORTEM_DEBUG=1 in the shell environment will ensure
|
|
||||||
that pdb.post_mortem() will be invoked on test failure::
|
|
||||||
|
|
||||||
$ OS_POST_MORTEM_DEBUG=1 ./run_tests.sh -d [test module path]
|
|
||||||
|
|||||||
226
run_tests.sh
226
run_tests.sh
@ -1,226 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
set -eu
|
|
||||||
|
|
||||||
function usage {
|
|
||||||
echo "Usage: $0 [OPTION]..."
|
|
||||||
echo "Run Tacker's test suite(s)"
|
|
||||||
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 " -r, --recreate-db Recreate the test database (deprecated, as this is now the default)."
|
|
||||||
echo " -n, --no-recreate-db Don't recreate the test database."
|
|
||||||
echo " -f, --force Force a clean re-build of the virtual environment. Useful when dependencies have been added."
|
|
||||||
echo " -u, --update Update the virtual environment with any newer package versions"
|
|
||||||
echo " -p, --pep8 Just run PEP8 and HACKING compliance check"
|
|
||||||
echo " -P, --no-pep8 Don't run static code checks"
|
|
||||||
echo " -c, --coverage Generate coverage report"
|
|
||||||
echo " -d, --debug Run tests with testtools instead of testr. This allows you to use the debugger."
|
|
||||||
echo " -h, --help Print this usage message"
|
|
||||||
echo " --virtual-env-path <path> Location of the virtualenv directory"
|
|
||||||
echo " Default: \$(pwd)"
|
|
||||||
echo " --virtual-env-name <name> Name of the virtualenv directory"
|
|
||||||
echo " Default: .venv"
|
|
||||||
echo " --tools-path <dir> Location of the tools directory"
|
|
||||||
echo " Default: \$(pwd)"
|
|
||||||
echo ""
|
|
||||||
echo "Note: with no options specified, the script will try to run the tests in a virtual environment,"
|
|
||||||
echo " If no virtualenv is found, the script will ask if you would like to create one. If you "
|
|
||||||
echo " prefer to run tests NOT in a virtual environment, simply pass the -N option."
|
|
||||||
exit
|
|
||||||
}
|
|
||||||
|
|
||||||
function process_options {
|
|
||||||
i=1
|
|
||||||
while [ $i -le $# ]; do
|
|
||||||
case "${!i}" in
|
|
||||||
-h|--help) usage;;
|
|
||||||
-V|--virtual-env) always_venv=1; never_venv=0;;
|
|
||||||
-N|--no-virtual-env) always_venv=0; never_venv=1;;
|
|
||||||
-s|--no-site-packages) no_site_packages=1;;
|
|
||||||
-r|--recreate-db) recreate_db=1;;
|
|
||||||
-n|--no-recreate-db) recreate_db=0;;
|
|
||||||
-f|--force) force=1;;
|
|
||||||
-u|--update) update=1;;
|
|
||||||
-p|--pep8) just_pep8=1;;
|
|
||||||
-P|--no-pep8) no_pep8=1;;
|
|
||||||
-c|--coverage) coverage=1;;
|
|
||||||
-d|--debug) debug=1;;
|
|
||||||
--virtual-env-path)
|
|
||||||
(( i++ ))
|
|
||||||
venv_path=${!i}
|
|
||||||
;;
|
|
||||||
--virtual-env-name)
|
|
||||||
(( i++ ))
|
|
||||||
venv_dir=${!i}
|
|
||||||
;;
|
|
||||||
--tools-path)
|
|
||||||
(( i++ ))
|
|
||||||
tools_path=${!i}
|
|
||||||
;;
|
|
||||||
-*) testropts="$testropts ${!i}";;
|
|
||||||
*) testrargs="$testrargs ${!i}"
|
|
||||||
esac
|
|
||||||
(( i++ ))
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
tool_path=${tools_path:-$(pwd)}
|
|
||||||
venv_path=${venv_path:-$(pwd)}
|
|
||||||
venv_dir=${venv_name:-.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
|
|
||||||
debug=0
|
|
||||||
recreate_db=1
|
|
||||||
update=0
|
|
||||||
|
|
||||||
LANG=en_US.UTF-8
|
|
||||||
LANGUAGE=en_US:en
|
|
||||||
LC_ALL=C
|
|
||||||
|
|
||||||
process_options $@
|
|
||||||
# Make our paths available to other scripts we call
|
|
||||||
export venv_path
|
|
||||||
export venv_dir
|
|
||||||
export venv_name
|
|
||||||
export tools_dir
|
|
||||||
export venv=${venv_path}/${venv_dir}
|
|
||||||
|
|
||||||
if [ $no_site_packages -eq 1 ]; then
|
|
||||||
installvenvopts="--no-site-packages"
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
function run_tests {
|
|
||||||
# Cleanup *pyc
|
|
||||||
${wrapper} find . -type f -name "*.pyc" -delete
|
|
||||||
|
|
||||||
if [ $debug -eq 1 ]; then
|
|
||||||
if [ "$testropts" = "" ] && [ "$testrargs" = "" ]; then
|
|
||||||
# Default to running all tests if specific test is not
|
|
||||||
# provided.
|
|
||||||
testrargs="discover ./tacker/tests"
|
|
||||||
fi
|
|
||||||
${wrapper} python -m testtools.run $testropts $testrargs
|
|
||||||
|
|
||||||
# Short circuit because all of the testr and coverage stuff
|
|
||||||
# below does not make sense when running testtools.run for
|
|
||||||
# debugging purposes.
|
|
||||||
return $?
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ $coverage -eq 1 ]; then
|
|
||||||
TESTRTESTS="$TESTRTESTS --coverage"
|
|
||||||
else
|
|
||||||
TESTRTESTS="$TESTRTESTS --slowest"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Just run the test suites in current environment
|
|
||||||
set +e
|
|
||||||
testrargs=`echo "$testrargs" | sed -e's/^\s*\(.*\)\s*$/\1/'`
|
|
||||||
TESTRTESTS="$TESTRTESTS --testr-args='--subunit $testropts $testrargs'"
|
|
||||||
OS_TEST_PATH=`echo $testrargs|grep -o 'tacker\.tests[^[:space:]:]*\+'|tr . /`
|
|
||||||
if [ -d "$OS_TEST_PATH" ]; then
|
|
||||||
wrapper="OS_TEST_PATH=$OS_TEST_PATH $wrapper"
|
|
||||||
elif [ -d "$(dirname $OS_TEST_PATH)" ]; then
|
|
||||||
wrapper="OS_TEST_PATH=$(dirname $OS_TEST_PATH) $wrapper"
|
|
||||||
fi
|
|
||||||
echo "Running \`${wrapper} $TESTRTESTS\`"
|
|
||||||
bash -c "${wrapper} $TESTRTESTS | ${wrapper} subunit2pyunit"
|
|
||||||
RESULT=$?
|
|
||||||
set -e
|
|
||||||
|
|
||||||
copy_subunit_log
|
|
||||||
|
|
||||||
if [ $coverage -eq 1 ]; then
|
|
||||||
echo "Generating coverage report in covhtml/"
|
|
||||||
# Don't compute coverage for common code, which is tested elsewhere
|
|
||||||
${wrapper} coverage combine
|
|
||||||
${wrapper} coverage html --include='tacker/*' --omit='tacker/openstack/common/*' -d covhtml -i
|
|
||||||
fi
|
|
||||||
|
|
||||||
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 flake8 ..."
|
|
||||||
|
|
||||||
${wrapper} flake8
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
TESTRTESTS="python -m tacker.openstack.common.lockutils python setup.py testr"
|
|
||||||
|
|
||||||
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 [ $update -eq 1 ]; then
|
|
||||||
echo "Updating virtualenv..."
|
|
||||||
python tools/install_venv.py $installvenvopts
|
|
||||||
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
|
|
||||||
run_pep8
|
|
||||||
exit
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ $recreate_db -eq 1 ]; then
|
|
||||||
rm -f tests.sqlite
|
|
||||||
fi
|
|
||||||
|
|
||||||
run_tests
|
|
||||||
|
|
||||||
# NOTE(sirp): we only want to run pep8 when we're running the full-test suite,
|
|
||||||
# not when we're running tests individually. To handle this, we need to
|
|
||||||
# distinguish between options (testropts), which begin with a '-', and
|
|
||||||
# arguments (testrargs).
|
|
||||||
if [ -z "$testrargs" ]; then
|
|
||||||
if [ $no_pep8 -eq 0 ]; then
|
|
||||||
run_pep8
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
Loading…
Reference in New Issue
Block a user