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

[nobody at svn.erp5.org]

Author: jm
Date: Wed Feb  2 19:24:36 2011
New Revision: 42952

URL: http://svn.erp5.org?rev=42952&view=rev
Log:
ERP5TypeTestCase: fix condition to run some code only once

This fixes unwanted calls to _setUpDummyMailHost

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=42952&r1=42951&r2=42952&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py [utf8] Wed Feb  2 19:24:36 2011
@@ -228,7 +228,7 @@ failed_portal_installation = {}
 
 # have we installed business templates ?
 # this is a mapping 'list of business template -> boolean
-setup_done = {}
+setup_done = set()
 
 def _getConnectionStringDict():
   """Returns the connection strings used for this test.
@@ -930,9 +930,9 @@ class ERP5TypeCommandLineTestCase(ERP5Ty
         app.test_portal_name = portal_name
 
         global setup_done
-        portal = app._getOb(portal_name, None)
-        if portal is None or not setup_done.get(tuple(business_template_list)):
-          setup_done[tuple(business_template_list)] = 1
+        setup_key = (portal_name,) + tuple(business_template_list)
+        if setup_key not in setup_done:
+          setup_done.add(setup_key)
           business_template_list = \
             self._getBTPathAndIdList(business_template_list)
           try:
@@ -951,7 +951,7 @@ class ERP5TypeCommandLineTestCase(ERP5Ty
               setattr(app, 'isIndexable', 0)
               reindex = 0
 
-            if portal is None:
+            if app._getOb(portal_name, None) is None:
               if not quiet:
                 ZopeTestCase._print('Adding %s ERP5 Site ... ' % portal_name)