[Checkins] SVN: Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_FSSecurity.py Fix bad merge moar harder.

[Tres Seaver]

Log message for revision 124574:
  Fix bad merge moar harder.

Changed:
  U   Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_FSSecurity.py

-=-
Modified: Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_FSSecurity.py
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_FSSecurity.py	2012-03-11 18:04:15 UTC (rev 124573)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_FSSecurity.py	2012-03-11 19:12:32 UTC (rev 124574)
@@ -18,13 +18,14 @@
 from time import sleep
 
 from AccessControl.Permission import Permission
+from App.config import getConfiguration
 
 from Products.CMFCore.tests.base.testcase import LogInterceptor
 from Products.CMFCore.tests.base.testcase import RequestTest
 from Products.CMFCore.tests.base.testcase import WritableFSDVTest
 
 
-class FSSecurityBase(RequestTest, WritableFSDVTest, LogInterceptor):
+class MetadataChecker(object):
 
     def _checkSettings(self, object, permissionname, acquire=0, roles=[]):
         # check the roles and acquire settings for a permission on an
@@ -48,6 +49,10 @@
             raise ValueError("'%s' not found in inherited permissions."
                              % permissionname)
 
+
+class FSSecurityBase(RequestTest, WritableFSDVTest, LogInterceptor,
+                     MetadataChecker):
+
     def setUp( self ):
         # initialise skins
         WritableFSDVTest.setUp(self)