[Checkins] SVN: z3ext.controlpanel/trunk/ - Updated test set up to run with ZTK 1.0.

[Michael Howitz]

Log message for revision 118436:
  - Updated test set up to run with ZTK 1.0.
  
  

Changed:
  U   z3ext.controlpanel/trunk/CHANGES.txt
  U   z3ext.controlpanel/trunk/setup.py
  U   z3ext.controlpanel/trunk/src/z3ext/controlpanel/tests/ftesting.zcml

-=-
Modified: z3ext.controlpanel/trunk/CHANGES.txt
===================================================================
--- z3ext.controlpanel/trunk/CHANGES.txt	2010-11-17 07:52:41 UTC (rev 118435)
+++ z3ext.controlpanel/trunk/CHANGES.txt	2010-11-17 08:39:48 UTC (rev 118436)
@@ -7,7 +7,9 @@
 
 - ZTK support
 
+- Updated test set up to run with ZTK 1.0.
 
+
 1.5.0 (2009-08-11)
 ------------------
 
@@ -37,7 +39,7 @@
 
 - Added 'Content types' configlet category
 
-- Added helper wizard form class 
+- Added helper wizard form class
 
 - Do not use z3c.autoinclude
 

Modified: z3ext.controlpanel/trunk/setup.py
===================================================================
--- z3ext.controlpanel/trunk/setup.py	2010-11-17 07:52:41 UTC (rev 118435)
+++ z3ext.controlpanel/trunk/setup.py	2010-11-17 08:39:48 UTC (rev 118436)
@@ -74,18 +74,21 @@
                           'z3ext.layoutform',
                           'z3ext.resourcepackage',
                           ],
-      extras_require = dict(test=['zope.securitypolicy',
-                                  'zope.app.testing',
-                                  'zope.testing',
-                                  'zope.testbrowser',
-                                  'zope.principalregistry',
-                                  'zope.login',
-                                  'z3c.breadcrumb',
-                                  'z3ext.wizard',
-                                  'z3ext.security',
-                                  'z3ext.autoinclude',
-                                  'z3ext.ui.breadcrumbs',
-                                  ]),
+      extras_require = dict(test=[
+          'z3c.breadcrumb',
+          'z3ext.autoinclude',
+          'z3ext.security',
+          'z3ext.ui.breadcrumbs',
+          'z3ext.wizard',
+          'zope.app.folder',
+          'zope.app.testing',
+          'zope.dublincore >= 3.7',
+          'zope.login',
+          'zope.principalregistry',
+          'zope.securitypolicy',
+          'zope.testbrowser',
+          'zope.testing',
+          ]),
       include_package_data = True,
       zip_safe = False
       )

Modified: z3ext.controlpanel/trunk/src/z3ext/controlpanel/tests/ftesting.zcml
===================================================================
--- z3ext.controlpanel/trunk/src/z3ext/controlpanel/tests/ftesting.zcml	2010-11-17 07:52:41 UTC (rev 118435)
+++ z3ext.controlpanel/trunk/src/z3ext/controlpanel/tests/ftesting.zcml	2010-11-17 08:39:48 UTC (rev 118436)
@@ -4,6 +4,15 @@
    i18n_domain="zope">
 
   <exclude package="zope.dublincore.browser" />
+  <exclude package="zope.app.cache.browser" />
+  <exclude package="lovely.memcached.browser" />
+  <exclude package="zope.app.authentication.browser" file="session.zcml" />
+  <exclude package="zope.app.authentication.browser" file="httpplugins.zcml" />
+  <exclude package="zope.app.authentication.browser" file="principalfolder.zcml" />
+  <exclude package="zope.app.authentication.browser" file="groupfolder.zcml" />
+  <exclude package="zope.app.authentication.browser" />
+  <exclude package="zope.app.folder.browser" />
+  <exclude package="z3c.form.browser" file="radio.zcml" />
 
   <include package="z3ext.autoinclude" file="meta.zcml" />
   <includeAllDependencies package="z3ext.controlpanel" extras="test" />
@@ -11,6 +20,8 @@
   <include package="z3ext.controlpanel.tests" />
   <includeOverrides package="z3ext.controlpanel.tests" file="overrides.zcml" />
 
+  <include package="zope.traversing.browser" />
+
   <securityPolicy
      component="z3ext.security.securitypolicy.SecurityPolicy" />
 
@@ -29,7 +40,7 @@
   <grant permission="zope.View"
          role="zope.Anonymous" />
 
-  <grant permission="zope.app.dublincore.view"
+  <grant permission="zope.dublincore.view"
          role="zope.Anonymous" />
 
   <!-- Principals -->