[Checkins] SVN: GenericSetup/trunk/tests/test_components.py - make sure the componentregistry tests don't introduce a fixed

[Jens Vagelpohl]

Log message for revision 76613:
  - make sure the componentregistry tests don't introduce a fixed
    dependency on five.localsitemanager
  

Changed:
  U   GenericSetup/trunk/tests/test_components.py

-=-
Modified: GenericSetup/trunk/tests/test_components.py
===================================================================
--- GenericSetup/trunk/tests/test_components.py	2007-06-11 14:54:27 UTC (rev 76612)
+++ GenericSetup/trunk/tests/test_components.py	2007-06-11 15:08:38 UTC (rev 76613)
@@ -36,10 +36,15 @@
 from zope.component import getSiteManager
 from zope.component import queryUtility
 from zope.component.globalregistry import base
-from five.localsitemanager.registry import PersistentComponents
 from zope.interface import implements
 from zope.interface import Interface
 
+try:
+    from five.localsitemanager.registry import PersistentComponents
+except ImportError:
+    # Avoid generating a spurious dependency
+    PersistentComponents = None
+
 _marker = []
 
 def createComponentRegistry(context):
@@ -220,16 +225,20 @@
     def beforeTearDown(self):
         clearSite()
 
-
-def test_suite():
-    # reimport to make sure tests are run from Products
-    from Products.GenericSetup.tests.test_components \
-            import ComponentRegistryXMLAdapterTests
-
-    return unittest.TestSuite((
-        unittest.makeSuite(ComponentRegistryXMLAdapterTests),
-        ))
-
+if PersistentComponents is not None:
+    def test_suite():
+        # reimport to make sure tests are run from Products
+        from Products.GenericSetup.tests.test_components \
+                import ComponentRegistryXMLAdapterTests
+    
+        return unittest.TestSuite((
+            unittest.makeSuite(ComponentRegistryXMLAdapterTests),
+            ))
+else:
+    def test_suite():
+        return unittest.TestSuite()
+    
 if __name__ == '__main__':
     from Products.GenericSetup.testing import run
     run(test_suite())
+