[Zope-Checkins] CVS: Zope/utilities - testrunner.py:1.22.2.1

[Shane Hathaway]

Update of /cvs-repository/Zope/utilities
In directory cvs.zope.org:/tmp/cvs-serv7931/utilities

Modified Files:
      Tag: Zope-2_5-branch
	testrunner.py 
Log Message:
Sync with trunk


=== Zope/utilities/testrunner.py 1.22 => 1.22.2.1 ===
         os.environ['SOFTWARE_HOME'] = sw_home
 
+    try:
+        # Try to set up the testing environment (esp. INSTANCE_HOME,
+        # so we use the right custom_zodb.py.)
+        import Testing
+    except ImportError:
+        pass
+
     if test_all:
         testrunner.runAllTests()
     elif pathname: