[Plone-cvs] r46032 - in plone.testing/trunk: . src/plone/testing

[Stefan H. H. <svn...@pl...>]

Author: shh42
Date: Mon Nov 29 20:36:49 2010
New Revision: 46032

Modified:
   plone.testing/trunk/CHANGES.txt
   plone.testing/trunk/src/plone/testing/z2.py
Log:
Ignore the testinghome configuration setting if present.

Modified: plone.testing/trunk/CHANGES.txt
==============================================================================
--- plone.testing/trunk/CHANGES.txt	(original)
+++ plone.testing/trunk/CHANGES.txt	Mon Nov 29 20:36:49 2010
@@ -4,6 +4,9 @@
 1.0a3 - Unreleased
 ------------------
 
+- Ignore the `testinghome` configuration setting if present.
+  [stefan]
+
 - Use the new API for getting the packages_to_initialize list in Zope 2.13.
   [davisagli]
 

Modified: plone.testing/trunk/src/plone/testing/z2.py
==============================================================================
--- plone.testing/trunk/src/plone/testing/z2.py	(original)
+++ plone.testing/trunk/src/plone/testing/z2.py	Mon Nov 29 20:36:49 2010
@@ -522,11 +522,21 @@
         """Trigger Zope startup and set up the application.
         """
 
-        import Zope2
+        # If the Zope2 Testing module has been imported, the testinghome
+        # variable is set and changes the way Zope2.App.startup works.
+        # We want the standard behavior so we remove it.
+
+        import App.config
+        config = App.config.getConfiguration()
+        if hasattr(config, 'testinghome'):
+            self._testingHome = config.testinghome
+            del config.testinghome
+            App.config.setConfiguration(config)
 
         # This uses the DB from the dbtab, as configured in setUpDatabase().
         # That DB then gets stored as Zope2.DB and becomes the default.
 
+        import Zope2
         Zope2.startup()
 
         # At this point, Zope2.DB is set to the test database facade. This is
@@ -548,6 +558,13 @@
         Zope2.zpublisher_exception_hook = None
         Zope2.__bobo_before__ = None
 
+        if hasattr(self, '_testingHome'):
+            import App.config
+            config = App.config.getConfiguration()
+            config.testinghome = self._testingHome
+            App.config.setConfiguration(config)
+            del self._testingHome
+
     def setUpBasicProducts(self):
         """Install a minimal set of products required for Zope 2.
         """