[Erp5-report] r36988 vincent - /erp5/trunk/products/ERP5Type/tests/runUnitTest.py

[nobody at svn.erp5.org]

Author: vincent
Date: Thu Jul  8 16:36:19 2010
New Revision: 36988

URL: http://svn.erp5.org?rev=36988&view=rev
Log:
Factorise zope_home computation.

Modified:
    erp5/trunk/products/ERP5Type/tests/runUnitTest.py

Modified: erp5/trunk/products/ERP5Type/tests/runUnitTest.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/tests/runUnitTest.py?rev=36988&r1=36987&r2=36988&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/tests/runUnitTest.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/tests/runUnitTest.py [utf8] Thu Jul  8 16:36:19 2010
@@ -220,8 +220,6 @@ if 'SOFTWARE_HOME' in os.environ:
   if not os.path.exists(software_home):
     raise ValueError('SOFTWARE_HOME is set to non existing directory %r'
                       % (software_home,))
-  # software_home is zope_home/lib/python, remove lib/python
-  zope_home = os.path.split(os.path.split(software_home)[0])[0]
 else:
   common_paths = [
     '/usr/lib/erp5/lib/python',
@@ -246,9 +244,11 @@ else:
       break
   else:
     sys.exit('No Zope2 software_home found')
-  zope_home = os.path.dirname(os.path.dirname(software_home))
   os.environ['SOFTWARE_HOME'] = software_home
 
+# software_home is zope_home/lib/python, remove lib/python
+zope_home = os.path.dirname(os.path.dirname(software_home))
+
 # SOFTWARE_HOME must be early in sys.path, otherwise some products will
 # import ImageFile from PIL instead of from Zope!
 if software_home not in sys.path: