[Checkins] SVN: zope.app.rotterdam/trunk/ Replaced test dependency on ``zope.app.securitypolicy`` by ``zope.securitypolicy``.

[Michael Howitz]

Log message for revision 116388:
  Replaced test dependency on ``zope.app.securitypolicy`` by ``zope.securitypolicy``.
  
  

Changed:
  U   zope.app.rotterdam/trunk/CHANGES.txt
  U   zope.app.rotterdam/trunk/setup.py
  U   zope.app.rotterdam/trunk/src/zope/app/rotterdam/ftesting.zcml

-=-
Modified: zope.app.rotterdam/trunk/CHANGES.txt
===================================================================
--- zope.app.rotterdam/trunk/CHANGES.txt	2010-09-14 13:49:10 UTC (rev 116387)
+++ zope.app.rotterdam/trunk/CHANGES.txt	2010-09-14 13:52:20 UTC (rev 116388)
@@ -7,7 +7,10 @@
 
 - Removed not needed test dependency on ``zope.app.zptpage``.
 
+- Replaced test dependency on ``zope.app.securitypolicy`` by
+  ``zope.securitypolicy``.
 
+
 3.5.1 (2010-01-08)
 ------------------
 

Modified: zope.app.rotterdam/trunk/setup.py
===================================================================
--- zope.app.rotterdam/trunk/setup.py	2010-09-14 13:49:10 UTC (rev 116387)
+++ zope.app.rotterdam/trunk/setup.py	2010-09-14 13:52:20 UTC (rev 116388)
@@ -52,10 +52,12 @@
       packages=find_packages('src'),
       package_dir = {'': 'src'},
       namespace_packages=['zope', 'zope.app'],
-      extras_require = dict(test=['zope.app.testing',
-                                  'zope.app.securitypolicy',
-                                  'zope.app.zcmlfiles',
-                                  'zope.login',]),
+      extras_require = dict(test=[
+          'zope.app.testing',
+          'zope.app.zcmlfiles',
+          'zope.login',
+          'zope.securitypolicy',
+          ]),
       install_requires=['setuptools',
                         'zope.app.basicskin',
                         'zope.app.form',

Modified: zope.app.rotterdam/trunk/src/zope/app/rotterdam/ftesting.zcml
===================================================================
--- zope.app.rotterdam/trunk/src/zope/app/rotterdam/ftesting.zcml	2010-09-14 13:49:10 UTC (rev 116387)
+++ zope.app.rotterdam/trunk/src/zope/app/rotterdam/ftesting.zcml	2010-09-14 13:52:20 UTC (rev 116388)
@@ -11,7 +11,7 @@
   <include package="zope.app.zcmlfiles" />
   <include package="zope.app.authentication" />
 
-  <include package="zope.app.securitypolicy" />
+  <include package="zope.securitypolicy" />
   <include package="zope.login" />
 
   <securityPolicy
@@ -20,7 +20,6 @@
   <role id="zope.Manager" title="Site Manager" />
 
   <grantAll role="zope.Manager" />
-  <include package="zope.app.securitypolicy.browser.tests" file="functional.zcml" />
 
   <!-- Principal that tests generally run as -->
   <principal
@@ -29,13 +28,6 @@
       login="mgr"
       password="mgrpw" />
 
-  <!-- Bootstrap principal used to make local grant to the principal above -->
-  <principal
-      id="zope.globalmgr"
-      title="Manager"
-      login="globalmgr"
-      password="globalmgrpw" />
+  <grant role="zope.Manager" principal="zope.mgr" />
 
-  <grant role="zope.Manager" principal="zope.globalmgr" />
-
 </configure>