[Checkins] SVN: zc.catalog/trunk/ Fixing test with recent version of ZTK (use zope.login).

[Sylvain Viollon]

Log message for revision 108320:
  Fixing test with recent version of ZTK (use zope.login).
  
  

Changed:
  U   zc.catalog/trunk/CHANGES.txt
  U   zc.catalog/trunk/setup.py
  U   zc.catalog/trunk/src/zc/catalog/browser/ftesting.zcml

-=-
Modified: zc.catalog/trunk/CHANGES.txt
===================================================================
--- zc.catalog/trunk/CHANGES.txt	2010-01-20 13:49:14 UTC (rev 108319)
+++ zc.catalog/trunk/CHANGES.txt	2010-01-20 14:00:44 UTC (rev 108320)
@@ -8,7 +8,7 @@
 1.4.2 (unreleased)
 ------------------
 
-* ...
+* Fix missing testing dependencies when using ZTK by adding zope.login.
 
 1.4.1 (2009-02-27)
 ------------------

Modified: zc.catalog/trunk/setup.py
===================================================================
--- zc.catalog/trunk/setup.py	2010-01-20 13:49:14 UTC (rev 108319)
+++ zc.catalog/trunk/setup.py	2010-01-20 14:00:44 UTC (rev 108320)
@@ -68,12 +68,13 @@
       extras_require=dict(
            test=['zope.app.authentication',
                  'zope.app.catalog',
-                 'zope.app.securitypolicy',
                  'zope.app.server',
                  'zope.app.testing',
                  'zope.app.zcmlfiles',
+                 'zope.intid',
                  'zope.keyreference',
-                 'zope.intid',
+                 'zope.login',
+                 'zope.securitypolicy',
                  'zope.testbrowser',
                  'zope.testing',
                  ]),
@@ -81,12 +82,12 @@
                         'pytz',
                         'setuptools',
                         'zope.catalog',
+                        'zope.component',
                         'zope.container',
-                        'zope.component',
                         'zope.i18nmessageid',
                         'zope.index>=3.5.1',
                         'zope.interface',
-                        'zope.publisher',
+                        'zope.publisher >= 3.12',
                         'zope.schema',
                         'zope.security',
                         ],

Modified: zc.catalog/trunk/src/zc/catalog/browser/ftesting.zcml
===================================================================
--- zc.catalog/trunk/src/zc/catalog/browser/ftesting.zcml	2010-01-20 13:49:14 UTC (rev 108319)
+++ zc.catalog/trunk/src/zc/catalog/browser/ftesting.zcml	2010-01-20 14:00:44 UTC (rev 108320)
@@ -19,14 +19,15 @@
   <include package="zope.keyreference" />
   <include package="zope.intid" />
   <include package="zope.app.catalog" />
+  <include package="zope.login" />
   <include package="zc.catalog" />
 
   <subscriber handler="zc.catalog.browser.tests.initializeIntIds" />
 
   <!-- Security -->
 
-  <include package="zope.app.securitypolicy" file="meta.zcml" />
-  <include package="zope.app.securitypolicy" />
+  <include package="zope.securitypolicy" file="meta.zcml" />
+  <include package="zope.securitypolicy" />
 
   <securityPolicy
       component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy" />