Fix tests to run with Products.GenericSetup >= 1.10.

zopefoundation · Feb 6, 2018 · 8ee2741 · 8ee2741
1 parent d4f445c
commit 8ee2741
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,6 +4,7 @@ Changelog
 4.1 (unreleased)
 ----------------
 
+- Fix tests to run with `Products.GenericSetup >= 1.10`.
 
 4.0 (2017-09-14)
 ----------------

diff --git a/src/Products/MailHost/tests/test_exportimport.py b/src/Products/MailHost/tests/test_exportimport.py
@@ -15,6 +15,8 @@
 
 import unittest
 
+import zope.component
+
 try:
     from Products.GenericSetup.testing import BodyAdapterTestCase
     from Products.GenericSetup.testing import ExportImportZCMLLayer
@@ -39,14 +41,13 @@ class ExportImportZCMLLayer: pass
 """
 
 
-unittest.skipUnless(HAVE_GS, 'Products.GenericSetup not available.')
+@unittest.skipUnless(HAVE_GS, 'Products.GenericSetup not available.')
 class MailHostXMLAdapterTests(BodyAdapterTestCase, unittest.TestCase):
 
     layer = ExportImportZCMLLayer
 
     def _getTargetClass(self):
-        from Products.GenericSetup.MailHost.exportimport \
-                import MailHostXMLAdapter
+        from Products.MailHost.exportimport import MailHostXMLAdapter
 
         return MailHostXMLAdapter
 
@@ -69,9 +70,14 @@ def setUp(self):
 
         self._obj = MailHost('foo_mailhost')
         self._BODY = _MAILHOST_BODY
+        zope.component.provideAdapter(self._getTargetClass())
+
+    def tearDown(self):
+        gsm = zope.component.getGlobalSiteManager()
+        self.assertTrue(gsm.unregisterAdapter(self._getTargetClass()))
 
 
-unittest.skipUnless(HAVE_GS, 'Products.GenericSetup not available.')
+@unittest.skipUnless(HAVE_GS, 'Products.GenericSetup not available.')
 class MailHostXMLAdapterTestsWithoutQueue(MailHostXMLAdapterTests):
 
     def _verifyImport(self, obj):
@@ -85,16 +91,16 @@ def setUp(self):
         del mh.smtp_queue
         del mh.smtp_queue_directory
         self._BODY = _MAILHOST_BODY
+        zope.component.provideAdapter(self._getTargetClass())
 
 
-unittest.skipUnless(HAVE_GS, 'Products.GenericSetup not available.')
+@unittest.skipUnless(HAVE_GS, 'Products.GenericSetup not available.')
 class MailHostXMLAdapterTestsWithQueue(BodyAdapterTestCase, unittest.TestCase):
 
     layer = ExportImportZCMLLayer
 
     def _getTargetClass(self):
-        from Products.GenericSetup.MailHost.exportimport \
-                import MailHostXMLAdapter
+        from Products.MailHost.exportimport import MailHostXMLAdapter
 
         return MailHostXMLAdapter
 
@@ -113,9 +119,11 @@ def setUp(self):
 
         self._obj = MailHost('foo_mailhost')
         self._BODY = _MAILHOST_BODY_v2
+        zope.component.provideAdapter(self._getTargetClass())
+
 
 
-unittest.skipUnless(HAVE_GS, 'Products.GenericSetup not available.')
+@unittest.skipUnless(HAVE_GS, 'Products.GenericSetup not available.')
 class MailHostXMLAdapterTestsWithNoneValue(MailHostXMLAdapterTests):
 
     def _verifyImport(self, obj):
@@ -134,6 +142,7 @@ def setUp(self):
         self._obj = MailHost('foo_mailhost')
         self._obj.smtp_uid = None
         self._BODY = _MAILHOST_BODY
+        zope.component.provideAdapter(self._getTargetClass())
 
 
 def test_suite():