[Checkins] SVN: Sandbox/shane/republish/zope.publisher/s Removed dependence on zope.app.testing

Shane Hathaway shane at hathawaymix.org
Sun Feb 8 04:01:16 EST 2009


Log message for revision 96233:
  Removed dependence on zope.app.testing
  

Changed:
  U   Sandbox/shane/republish/zope.publisher/setup.py
  U   Sandbox/shane/republish/zope.publisher/src/zope/publisher/tests/test_browser.py

-=-
Modified: Sandbox/shane/republish/zope.publisher/setup.py
===================================================================
--- Sandbox/shane/republish/zope.publisher/setup.py	2009-02-08 08:10:36 UTC (rev 96232)
+++ Sandbox/shane/republish/zope.publisher/setup.py	2009-02-08 09:01:16 UTC (rev 96233)
@@ -53,8 +53,7 @@
                         'zope.httpform',
                         ],
       extras_require=dict(
-          test = ['zope.testing',
-                  'zope.app.testing'],
+          test = ['zope.testing'],
           ),
       include_package_data = True,
 

Modified: Sandbox/shane/republish/zope.publisher/src/zope/publisher/tests/test_browser.py
===================================================================
--- Sandbox/shane/republish/zope.publisher/src/zope/publisher/tests/test_browser.py	2009-02-08 08:10:36 UTC (rev 96232)
+++ Sandbox/shane/republish/zope.publisher/src/zope/publisher/tests/test_browser.py	2009-02-08 09:01:16 UTC (rev 96233)
@@ -17,15 +17,34 @@
 """
 import unittest
 from zope.testing.doctestunit import DocTestSuite
-from zope.app.testing import setup
 
 __docformat__ = "reStructuredText"
 
+from zope.component.testing import PlacelessSetup as CAPlacelessSetup
+from zope.component.eventtesting import PlacelessSetup as EventPlacelessSetup
+from zope.i18n.testing import PlacelessSetup as I18nPlacelessSetup
+from zope.security.management import newInteraction
+
+class PlacelessSetup(CAPlacelessSetup,
+                     EventPlacelessSetup,
+                     I18nPlacelessSetup):
+
+    def setUp(self, doctesttest=None):
+        CAPlacelessSetup.setUp(self)
+        EventPlacelessSetup.setUp(self)
+        I18nPlacelessSetup.setUp(self)
+        newInteraction()
+
+    def tearDown_(self, doctesttest=None):
+        self.tearDown()
+
+ps = PlacelessSetup()
+
 def test_suite():
     return unittest.TestSuite((
         DocTestSuite('zope.publisher.browser',
-                     setUp=setup.placelessSetUp,
-                     tearDown=setup.placelessTearDown),
+                     setUp=ps.setUp,
+                     tearDown=ps.tearDown_),
         ))
 
 if __name__ == '__main__':



More information about the Checkins mailing list