[CMF-checkins] SVN: CMF/trunk/CMF Reverted r74060 and r74136 as they broke more than they fixed. It appears

[Stefan H. Holek]

Log message for revision 75029:
  Reverted r74060 and r74136 as they broke more than they fixed. It 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/trunk/CMFCore/testing.py
  U   CMF/trunk/CMFUid/testing.py

-=-
Modified: CMF/trunk/CMFCore/testing.py
===================================================================
--- CMF/trunk/CMFCore/testing.py	2007-05-02 21:04:49 UTC (rev 75028)
+++ CMF/trunk/CMFCore/testing.py	2007-05-02 21:06:43 UTC (rev 75029)
@@ -84,12 +84,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:
@@ -101,12 +99,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:
@@ -120,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 FunctionalZCMLLayer:
@@ -199,12 +193,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/trunk/CMFUid/testing.py
===================================================================
--- CMF/trunk/CMFUid/testing.py	2007-05-02 21:04:49 UTC (rev 75028)
+++ CMF/trunk/CMFUid/testing.py	2007-05-02 21:06:43 UTC (rev 75029)
@@ -12,10 +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