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

[nobody at svn.erp5.org]

Author: jerome
Date: Fri Oct 31 09:12:19 2008
New Revision: 24431

URL: http://svn.erp5.org?rev=24431&view=rev
Log:
honor SOFTWARE_HOME environment variables and other if they are set explicitly

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=24431&r1=24430&r2=24431&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/tests/runUnitTest.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/tests/runUnitTest.py [utf8] Fri Oct 31 09:12:19 2008
@@ -225,10 +225,10 @@
   if not test_list:
     print "No test to run, exiting immediately."
     return
-  os.environ['INSTANCE_HOME'] = instance_home
-  os.environ['SOFTWARE_HOME'] = software_home
-  os.environ['COPY_OF_INSTANCE_HOME'] = instance_home
-  os.environ['COPY_OF_SOFTWARE_HOME'] = software_home
+  os.environ.setdefault('INSTANCE_HOME', instance_home)
+  os.environ.setdefault('SOFTWARE_HOME', software_home)
+  os.environ.setdefault('COPY_OF_INSTANCE_HOME', instance_home)
+  os.environ.setdefault('COPY_OF_SOFTWARE_HOME', software_home)
   os.environ.setdefault('EVENT_LOG_FILE', os.path.join(tests_home, 'zLOG.log'))
   os.environ.setdefault('EVENT_LOG_SEVERITY', '-300')