[Checkins] SVN: Products.CMFCore/branches/2.2/Products/CMFCore/ Backported c114567 from trunk
Hanno Schlichting
hannosch at hannosch.eu
Sun Jul 11 06:53:36 EDT 2010
Log message for revision 114572:
Backported c114567 from trunk
Changed:
U Products.CMFCore/branches/2.2/Products/CMFCore/CHANGES.txt
U Products.CMFCore/branches/2.2/Products/CMFCore/FSDTMLMethod.py
U Products.CMFCore/branches/2.2/Products/CMFCore/FSReSTMethod.py
U Products.CMFCore/branches/2.2/Products/CMFCore/FSSTXMethod.py
U Products.CMFCore/branches/2.2/Products/CMFCore/folderAdd.dtml
U Products.CMFCore/branches/2.2/Products/CMFCore/testing.py
U Products.CMFCore/branches/2.2/Products/CMFCore/tests/base/testcase.py
-=-
Modified: Products.CMFCore/branches/2.2/Products/CMFCore/CHANGES.txt
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/CHANGES.txt 2010-07-11 10:52:35 UTC (rev 114571)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/CHANGES.txt 2010-07-11 10:53:36 UTC (rev 114572)
@@ -4,6 +4,8 @@
2.2.3 (unreleased)
------------------
+- Get most tests working under Zope 2.13.0a2.
+
- Added dependency on the new ``Products.ZSQLMethods`` distribution and updated
Zope2 requirement accordingly.
Modified: Products.CMFCore/branches/2.2/Products/CMFCore/FSDTMLMethod.py
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/FSDTMLMethod.py 2010-07-11 10:52:35 UTC (rev 114571)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/FSDTMLMethod.py 2010-07-11 10:53:36 UTC (rev 114572)
@@ -55,10 +55,8 @@
_reading = 0
manage_options=({'label':'Customize', 'action':'manage_main'},
- {'label':'View', 'action':'',
- 'help':('OFSP','DTML-DocumentOrMethod_View.stx')},
- {'label':'Proxy', 'action':'manage_proxyForm',
- 'help':('OFSP','DTML-DocumentOrMethod_Proxy.stx')},
+ {'label':'View', 'action':''},
+ {'label':'Proxy', 'action':'manage_proxyForm'},
)
security = ClassSecurityInfo()
Modified: Products.CMFCore/branches/2.2/Products/CMFCore/FSReSTMethod.py
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/FSReSTMethod.py 2010-07-11 10:52:35 UTC (rev 114571)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/FSReSTMethod.py 2010-07-11 10:53:36 UTC (rev 114572)
@@ -76,8 +76,7 @@
output_encoding = 'utf8'
manage_options=({'label' : 'Customize','action' : 'manage_main'},
- {'label' : 'View','action' : '',
- 'help' : ('OFSP' ,'DTML-DocumentOrMethod_View.stx')},
+ {'label' : 'View','action' : ''},
)
security = ClassSecurityInfo()
Modified: Products.CMFCore/branches/2.2/Products/CMFCore/FSSTXMethod.py
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/FSSTXMethod.py 2010-07-11 10:52:35 UTC (rev 114571)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/FSSTXMethod.py 2010-07-11 10:53:36 UTC (rev 114572)
@@ -84,8 +84,7 @@
_owner = None # unowned
manage_options=({'label' : 'Customize','action' : 'manage_main'},
- {'label' : 'View','action' : '',
- 'help' : ('OFSP' ,'DTML-DocumentOrMethod_View.stx')},
+ {'label' : 'View','action' : ''},
)
security = ClassSecurityInfo()
Modified: Products.CMFCore/branches/2.2/Products/CMFCore/folderAdd.dtml
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/folderAdd.dtml 2010-07-11 10:52:35 UTC (rev 114571)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/folderAdd.dtml 2010-07-11 10:53:36 UTC (rev 114572)
@@ -6,8 +6,6 @@
<BODY BGCOLOR="#FFFFFF" LINK="#000099" VLINK="#555555">
<H2>Add Folder</H2>
-<dtml-var "HelpSys.HelpButton('Folder_Add.stx','OFSP')">
-
<P>
A Folder contains other objects. Use Folders to organize your
web objects in to logical groups.
Modified: Products.CMFCore/branches/2.2/Products/CMFCore/testing.py
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/testing.py 2010-07-11 10:52:35 UTC (rev 114571)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/testing.py 2010-07-11 10:53:36 UTC (rev 114572)
@@ -16,6 +16,7 @@
"""
from OFS.SimpleItem import SimpleItem
+from Testing.ZopeTestCase import installPackage
from Testing.ZopeTestCase.layer import ZopeLite
from zope.component import adapts
from zope.i18n.interfaces import IUserPreferredLanguages
@@ -96,6 +97,27 @@
return ('test',)
+class OFSZCMLLayer(ZopeLite):
+
+ @classmethod
+ def testSetUp(cls):
+ import zope.component
+ import OFS
+ import Products.Five
+ zcml.load_config('meta.zcml', zope.component)
+ try:
+ zcml.load_config('meta.zcml', OFS)
+ zcml.load_config('configure.zcml', OFS)
+ except IOError: # Zope <= 2.13.0a2
+ zcml.load_config('meta.zcml', Products.Five)
+ installPackage('OFS')
+ setHooks()
+
+ @classmethod
+ def testTearDown(cls):
+ cleanUp()
+
+
class EventZCMLLayer(ZopeLite):
@classmethod
Modified: Products.CMFCore/branches/2.2/Products/CMFCore/tests/base/testcase.py
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/tests/base/testcase.py 2010-07-11 10:52:35 UTC (rev 114571)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/tests/base/testcase.py 2010-07-11 10:53:36 UTC (rev 114572)
@@ -20,6 +20,7 @@
from security import AnonymousUser
from security import PermissiveSecurityPolicy
from Products.CMFCore.utils import getPackageLocation
+from Products.CMFCore.testing import OFSZCMLLayer
class LogInterceptor:
@@ -98,6 +99,8 @@
class SecurityTest(TransactionalTest):
+ layer = OFSZCMLLayer
+
def setUp(self):
TransactionalTest.setUp(self)
self._policy = PermissiveSecurityPolicy()
More information about the checkins
mailing list