[Checkins] SVN: Products.CMFCore/trunk/Products/CMFCore/test Forward ported c114574 from 2.2 branch

Hanno Schlichting hannosch at hannosch.eu
Sun Jul 11 07:23:50 EDT 2010


Log message for revision 114575:
  Forward ported c114574 from 2.2 branch
  

Changed:
  U   Products.CMFCore/trunk/Products/CMFCore/testing.py
  U   Products.CMFCore/trunk/Products/CMFCore/tests/base/testcase.py

-=-
Modified: Products.CMFCore/trunk/Products/CMFCore/testing.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/testing.py	2010-07-11 11:20:20 UTC (rev 114574)
+++ Products.CMFCore/trunk/Products/CMFCore/testing.py	2010-07-11 11:23:49 UTC (rev 114575)
@@ -98,7 +98,7 @@
 class OFSZCMLLayer(ZopeLite):
 
     @classmethod
-    def testSetUp(cls):
+    def setUp(cls):
         import zope.component
         import OFS
         import Products.Five
@@ -108,11 +108,12 @@
             zcml.load_config('configure.zcml', OFS)
         except IOError:  # Zope <= 2.13.0a2
             zcml.load_config('meta.zcml', Products.Five)
+        # In Zope 2.12 this does an implicit commit
         installPackage('OFS')
         setHooks()
 
     @classmethod
-    def testTearDown(cls):
+    def tearDown(cls):
         cleanUp()
 
 

Modified: Products.CMFCore/trunk/Products/CMFCore/tests/base/testcase.py
===================================================================
--- Products.CMFCore/trunk/Products/CMFCore/tests/base/testcase.py	2010-07-11 11:20:20 UTC (rev 114574)
+++ Products.CMFCore/trunk/Products/CMFCore/tests/base/testcase.py	2010-07-11 11:23:49 UTC (rev 114575)
@@ -102,7 +102,7 @@
 
 class SecurityTest(TransactionalTest):
 
-    layer = OFSZCMLLayer
+    layer = ZopeLite
 
     def setUp(self):
         TransactionalTest.setUp(self)



More information about the checkins mailing list