]> review.fuel-infra Code Review - openstack-build/cinder-build.git/commitdiff
Don't need to init testr explicitly
authorKui Shi <skuicloud@gmail.com>
Fri, 30 Aug 2013 07:18:10 +0000 (15:18 +0800)
committerKui Shi <skuicloud@gmail.com>
Fri, 30 Aug 2013 07:19:38 +0000 (15:19 +0800)
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

index 6e9e17d852b1553b6a29e3755acb3e8b48affcca..30067952bd985f149970cf0929a2dc30985b2119 100755 (executable)
@@ -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,