[CMF-checkins] SVN: CMF/branches/2.1/C Reverted r74135 as it broke more than it fixed. Appears that testSetUp

[Stefan H. Holek]

Log message for revision 75028:
  Reverted r74135 as it broke more than it fixed. Appears that testSetUp
  and testTearDown are run before/after every *test*.
  
  See http://mail.zope.org/pipermail/cmf-tests/2007-May/date.html
  

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-05-02 21:02:44 UTC (rev 75027)
+++ CMF/branches/2.1/CHANGES.txt	2007-05-02 21:04:49 UTC (rev 75028)
@@ -9,9 +9,6 @@
     - Add POST-only protections to security critical methods (see
       http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-0240).
 
-    - 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-05-02 21:02:44 UTC (rev 75027)
+++ CMF/branches/2.1/CMFCore/testing.py	2007-05-02 21:04:49 UTC (rev 75028)
@@ -116,12 +116,10 @@
         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:
@@ -133,12 +131,10 @@
         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:
@@ -152,12 +148,10 @@
         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:
@@ -231,12 +225,10 @@
         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-05-02 21:02:44 UTC (rev 75027)
+++ CMF/branches/2.1/CMFUid/testing.py	2007-05-02 21:04:49 UTC (rev 75028)
@@ -12,9 +12,8 @@
         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
+