[CMF-checkins] SVN: CMF/branches/2.1/C - Forward-compatibility for Zope 2.11 testrunner.

[Tres Seaver]

Log message for revision 74135:
   - Forward-compatibility for Zope 2.11 testrunner.

Changed:
  U   CMF/branches/2.1/CHANGES.txt
  U   CMF/branches/2.1/CMFCore/testing.py
  U   CMF/branches/2.1/CMFUid/testing.py

-=-
Modified: CMF/branches/2.1/CHANGES.txt
===================================================================
--- CMF/branches/2.1/CHANGES.txt	2007-04-14 15:15:52 UTC (rev 74134)
+++ CMF/branches/2.1/CHANGES.txt	2007-04-14 17:07:29 UTC (rev 74135)
@@ -2,6 +2,9 @@
 
   Bug Fixes
 
+    - Added forward-compatibility fix for running tests under the
+      testrunner shipped with Zope 2.11.
+
     - Allow customization from DirectoryViews to be redirected into
       alternate folders, and use manually-built clones.
       (http://www.zope.org/Collectors/CMF/382)

Modified: CMF/branches/2.1/CMFCore/testing.py
===================================================================
--- CMF/branches/2.1/CMFCore/testing.py	2007-04-14 15:15:52 UTC (rev 74134)
+++ CMF/branches/2.1/CMFCore/testing.py	2007-04-14 17:07:29 UTC (rev 74135)
@@ -116,10 +116,12 @@
         zcml.load_config('event.zcml', Products.Five)
         zcml.load_config('event.zcml', Products.CMFCore)
         setHooks()
+    setUp = testSetUp  # forward-compatibility for Zope 2.11+ testrunner
 
     @classmethod
     def testTearDown(cls):
         cleanUp()
+    tearDown = testTearDown  # forward-compatibility for Zope 2.11+ testrunner
 
 
 class TraversingZCMLLayer:
@@ -131,10 +133,12 @@
         zcml.load_config('meta.zcml', Products.Five)
         zcml.load_config('traversing.zcml', Products.Five)
         setHooks()
+    setUp = testSetUp  # forward-compatibility for Zope 2.11+ testrunner
 
     @classmethod
     def testTearDown(cls):
         cleanUp()
+    tearDown = testTearDown  # forward-compatibility for Zope 2.11+ testrunner
 
 
 class TraversingEventZCMLLayer:
@@ -148,10 +152,12 @@
         zcml.load_config('event.zcml', Products.Five)
         zcml.load_config('event.zcml', Products.CMFCore)
         setHooks()
+    setUp = testSetUp  # forward-compatibility for Zope 2.11+ testrunner
 
     @classmethod
     def testTearDown(cls):
         cleanUp()
+    tearDown = testTearDown  # forward-compatibility for Zope 2.11+ testrunner
 
 
 class FunctionalZCMLLayer:
@@ -225,10 +231,12 @@
         zcml.load_config('configure.zcml', Products.CMFCore.exportimport)
         zcml.load_string(_DUMMY_ZCML)
         setHooks()
+    setUp = testSetUp  # forward-compatibility for Zope 2.11+ testrunner
 
     @classmethod
     def testTearDown(cls):
         cleanUp()
+    tearDown = testTearDown  # forward-compatibility for Zope 2.11+ testrunner
 
 
 def run(test_suite):

Modified: CMF/branches/2.1/CMFUid/testing.py
===================================================================
--- CMF/branches/2.1/CMFUid/testing.py	2007-04-14 15:15:52 UTC (rev 74134)
+++ CMF/branches/2.1/CMFUid/testing.py	2007-04-14 17:07:29 UTC (rev 74135)
@@ -12,8 +12,9 @@
         zcml.load_config('event.zcml', Products.Five)
         zcml.load_config('event.zcml', Products.CMFUid)
         setHooks()
+    setUp = testSetUp  # forward-compatibility for Zope 2.11+ testrunner
 
     @classmethod
     def testTearDown(cls):
         cleanUp()
-
+    tearDown = testTearDown  # forward-compatibility for Zope 2.11+ testrunner