[Erp5-report] r28054 - /erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py

[nobody at svn.erp5.org]

Author: jm
Date: Fri Jul 10 14:18:46 2009
New Revision: 28054

URL: http://svn.erp5.org?rev=28054&view=rev
Log:
Temporary disable ZServer by default. You can enable it by setting start_zserver environment variable to 1.

The reason is that it always set values to portal_activities.distributingNode and portal_activities._nodes.
Before r28043, this didn't happen if self.tic wasn't called, and some projects expects that these variables are unset.

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

Modified: erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py?rev=28054&r1=28053&r2=28054&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py [utf8] Fri Jul 10 14:18:46 2009
@@ -693,12 +693,13 @@
                 from Products import DeadlockDebugger
               except ImportError:
                 pass
-              from Testing.ZopeTestCase.utils import startZServer
-              ZopeTestCase._print('Running ZServer on port %i\n'
-                                  % startZServer()[1])
-              if portal_activities is not None:
-                portal_activities.distributingNode = portal_activities.getCurrentNode()
-                portal_activities._nodes = portal_activities.distributingNode,
+              if int(os.environ.get('start_zserver', 0)):
+                from Testing.ZopeTestCase.utils import startZServer
+                ZopeTestCase._print('Running ZServer on port %i\n'
+                                    % startZServer()[1])
+                if portal_activities is not None:
+                  portal_activities.distributingNode = portal_activities.getCurrentNode()
+                  portal_activities._nodes = portal_activities.distributingNode,
 
             self._updateConnectionStrings()
             self._recreateCatalog()