Merge "Don't need to init testr explicitly"

This commit is contained in:
Jenkins 2013-09-03 09:26:17 +00:00 committed by Gerrit Code Review
commit 57d3e6e192

View File

@ -109,12 +109,6 @@ if [ $no_site_packages -eq 1 ]; then
installvenvopts="--no-site-packages" installvenvopts="--no-site-packages"
fi fi
function init_testr {
if [ ! -d .testrepository ]; then
${wrapper} testr init
fi
}
function run_tests { function run_tests {
# Cleanup *pyc # Cleanup *pyc
${wrapper} find . -type f -name "*.pyc" -delete ${wrapper} find . -type f -name "*.pyc" -delete
@ -235,7 +229,6 @@ if [ $recreate_db -eq 1 ]; then
rm -f tests.sqlite rm -f tests.sqlite
fi fi
init_testr
run_tests run_tests
# NOTE(sirp): we only want to run pep8 when we're running the full-test suite, # NOTE(sirp): we only want to run pep8 when we're running the full-test suite,