Don't need to init testr explicitly
In run_tests.sh, function init_testr will initialize testr if the directory .testrepository is not existed. Actually, testr will do the check before run the test: In Python package testrepository, setuptools_command.py:Testr.run 68 def run(self): 69 """Set up testr repo, then run testr""" 70 if not os.path.isdir(".testrepository"): 71 self._run_testr("init") So, init_testr can be removed safely. Fixes Bug #1220147 Change-Id: Ide99a836cd601453624c7a562b7256c86bd46811
This commit is contained in:
@@ -102,11 +102,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
|
||||||
@@ -223,7 +218,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,
|
||||||
|
Reference in New Issue
Block a user