[Erp5-report] r31653 leonardo - /erp5/trunk/products/ERP5OOo/tests/

[nobody at svn.erp5.org]

Author: leonardo
Date: Thu Jan  7 21:11:54 2010
New Revision: 31653

URL: http://svn.erp5.org?rev=31653&view=rev
Log:
installProduct() should only ever be called from the module top-level

Modified:
    erp5/trunk/products/ERP5OOo/tests/testOOoDynamicStyle.py
    erp5/trunk/products/ERP5OOo/tests/testOOoImport.py

Modified: erp5/trunk/products/ERP5OOo/tests/testOOoDynamicStyle.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/tests/testOOoDynamicStyle.py?rev=31653&r1=31652&r2=31653&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/tests/testOOoDynamicStyle.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/tests/testOOoDynamicStyle.py [utf8] Thu Jan  7 21:11:54 2010
@@ -37,6 +37,11 @@
 from zipfile import ZipFile, ZIP_DEFLATED
 from StringIO import StringIO
 
+ZopeTestCase.installProduct('Localizer')
+ZopeTestCase.installProduct('PythonScripts')
+ZopeTestCase.installProduct('ERP5OOo')
+ZopeTestCase.installProduct('Five')
+
 class TestOooDynamicStyle(ZopeTestCase.FunctionalTestCase):
   manager_username = 'tatuya'
   manager_password = 'tatuya'
@@ -54,9 +59,6 @@
 
   def afterSetUp(self):
     self.login()
-    ZopeTestCase.installProduct('Localizer')
-    ZopeTestCase.installProduct('PythonScripts')
-    ZopeTestCase.installProduct('ERP5OOo')
     self.folder.Localizer = DummyLocalizer()
     v12schema_url = os.path.join(os.path.dirname(__file__),
                                  'OpenDocument-schema-v1.2-draft9.rng') 

Modified: erp5/trunk/products/ERP5OOo/tests/testOOoImport.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/tests/testOOoImport.py?rev=31653&r1=31652&r2=31653&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/tests/testOOoImport.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/tests/testOOoImport.py [utf8] Thu Jan  7 21:11:54 2010
@@ -35,11 +35,14 @@
 from Testing import ZopeTestCase
 from AccessControl.SecurityManagement import newSecurityManager
 from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
+from Products.ERP5Type.tests.ERP5TypeTestCase import install_product_quiet
 from Products.ERP5Type.tests.Sequence import SequenceList
 from Products.ERP5OOo.OOoUtils import OOoParser
 from Products.ERP5.Document.Document import ConversionError
 from DateTime import DateTime
 import transaction
+
+ZopeTestCase.installProduct('Sessions', quiet=install_product_quiet)
 
 person_current_id = 1
 
@@ -102,7 +105,6 @@
     self.pref.enable()
 
     # create browser_id_manager
-    ZopeTestCase.installProduct('Sessions')
     if not "browser_id_manager" in self.portal.objectIds():
       self.portal.manage_addProduct['Sessions'].constructBrowserIdManager()