From 059bc7a08cea2704853beb4543a2df1f9b3080f0 Mon Sep 17 00:00:00 2001 From: Kui Shi Date: Fri, 30 Aug 2013 15:18:10 +0800 Subject: [PATCH] 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 #1216820 Change-Id: Id9815033c0cb0e1aa6693a4c14bf9a5d490c8883 --- run_tests.sh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/run_tests.sh b/run_tests.sh index 6e9e17d85..30067952b 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -109,12 +109,6 @@ 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 @@ -235,7 +229,6 @@ if [ $recreate_db -eq 1 ]; then rm -f tests.sqlite fi -init_testr run_tests # NOTE(sirp): we only want to run pep8 when we're running the full-test suite, -- 2.45.2