testERP5Core: also test the tools registration when testing the site manager migration

bt5/erp5_core_test/TestTemplateItem/portal_components/test.erp5.testERP5Core.py

@@ -576,7 +576,7 @@ class TestERP5Core(ERP5TypeTestCase, ZopeTestCase.Functional):
       if i.getId() not in ('portal_uidhandler',) and
          0 != i.getUid() != i.getProperty('uid')])
 
-  def test_site_manager_and_translation_migration(self):
+  def test_04_site_manager_and_translation_migration(self):
     from zope.site.hooks import getSite, setSite
     from zope.component import queryUtility
     from zope.i18n.interfaces import ITranslationDomain
@@ -594,25 +594,26 @@ class TestERP5Core(ERP5TypeTestCase, ZopeTestCase.Functional):
     self.assertEqual(queryUtility(ITranslationDomain, 'ui'), None)
     # now let's simulate a site just migrated from Zope 2.8 that's being
     # accessed for the first time:
-    old_site = getSite()
-    try:
+    from Products.ERP5 import ERP5Site
     setSite()
     # Sites from Zope2.8 don't have a site_manager yet.
     del self.portal._components
+    self.assertIsNotNone(ERP5Site._missing_tools_registered)
+    ERP5Site._missing_tools_registered = None
+    self.commit()
     # check that we can't get any translation utility
     self.assertEqual(queryUtility(ITranslationDomain, 'erp5_ui'), None)
     # Now simulate first access. Default behaviour from
     # ObjectManager is to raise a ComponentLookupError here:
+
     setSite(self.portal)
+    self.commit()
+    self.assertIsNotNone(ERP5Site._missing_tools_registered)
     # This should have automatically reconstructed the i18n utility
     # registrations:
     self.assertEqual(queryUtility(ITranslationDomain, 'erp5_ui'),
                      erp5_ui_catalog)
     self.assertEqual(queryUtility(ITranslationDomain, 'ui'), erp5_ui_catalog)
-    finally:
-      # clean everything up, we don't want to mess the test environment
-      self.abort()
-      setSite(old_site)
 
   def test_BasicAuthenticateDesactivated(self):
     """Make sure Unauthorized error does not lead to Basic auth popup in browser"""

[Julien Muchembled]

@aurel Is this commit still required ? Can we at least preserve indentation using if 1: # XXX: in the past, we cleaned up everything to not mess the test environment ?

[Aurel]

I reverted it and got this error :

======================================================================
ERROR: test_site_manager_and_translation_migration (erp5.component.test.erp5_version.testERP5Core.TestERP5Core)

Traceback (most recent call last):
File "<portal_components/test.erp5.testERP5Core>", line 609, in test_site_manager_and_translation_migration
self.assertEqual(queryUtility(ITranslationDomain, 'erp5_ui'),
File "/srv/slapgrid/slappart92/srv/runner/software/907d0cee900f4a267e98f6752d5866da/eggs/zope.component-3.9.5-py2.7.egg/zope/component/_api.py", line 172, in queryUtility
return getSiteManager(context).queryUtility(interface, name, default)
AttributeError: 'NoneType' object has no attribute 'queryUtility'

But maybe this migration should be tested in testUpgradeInstanceWithOldDataFs instead