installProduct() should only ever be called from the module top-level

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@31653 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5OOo/tests/testOOoDynamicStyle.py

@@ -37,6 +37,11 @@ from Testing import ZopeTestCase
 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 @@ class TestOooDynamicStyle(ZopeTestCase.FunctionalTestCase):
 
   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') 

product/ERP5OOo/tests/testOOoImport.py

@@ -35,12 +35,15 @@ from zLOG import LOG
 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 @@ class TestOOoImport(ERP5TypeTestCase):
     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()