[Checkins] SVN: zope.app.testing/trunk/s Switched test dependency from ``zope.app.securitypolicy`` to ``zope.securitypolicy``.

[Michael Howitz]

Log message for revision 116405:
  Switched test dependency from ``zope.app.securitypolicy`` to ``zope.securitypolicy``.
  
  

Changed:
  U   zope.app.testing/trunk/setup.py
  U   zope.app.testing/trunk/src/zope/app/testing/ftesting.zcml

-=-
Modified: zope.app.testing/trunk/setup.py
===================================================================
--- zope.app.testing/trunk/setup.py	2010-09-14 14:42:17 UTC (rev 116404)
+++ zope.app.testing/trunk/setup.py	2010-09-14 14:44:33 UTC (rev 116405)
@@ -56,13 +56,14 @@
       packages=find_packages('src'),
       package_dir = {'': 'src'},
       namespace_packages=['zope', 'zope.app'],
-      extras_require=dict(test=['zope.app.authentication',
-                                'zope.app.securitypolicy',
-                                'zope.app.zcmlfiles',
-                                'ZODB3',
-                                'zope.publisher >= 3.12',
-                                'zope.login',
-                                ]),
+      extras_require=dict(test=[
+          'ZODB3',
+          'zope.app.authentication',
+          'zope.app.zcmlfiles',
+          'zope.login',
+          'zope.publisher >= 3.12',
+          'zope.securitypolicy',
+          ]),
       install_requires=['setuptools',
                         'zope.annotation',
                         'zope.app.appsetup >=3.11.0',

Modified: zope.app.testing/trunk/src/zope/app/testing/ftesting.zcml
===================================================================
--- zope.app.testing/trunk/src/zope/app/testing/ftesting.zcml	2010-09-14 14:42:17 UTC (rev 116404)
+++ zope.app.testing/trunk/src/zope/app/testing/ftesting.zcml	2010-09-14 14:44:33 UTC (rev 116405)
@@ -11,9 +11,7 @@
   <include package="zope.app.zcmlfiles" />
 
   <include package="zope.app.authentication" />
-
-  <include package="zope.app.securitypolicy.browser.tests" file="functional.zcml" />
-  <include package="zope.app.securitypolicy" />
+  <include package="zope.securitypolicy" />
   <include package="zope.login" />
 
   <securityPolicy
@@ -43,15 +41,8 @@
       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" />
-
   <adapter
            factory="zope.app.testing.testing.ConflictRaisingView"
            name="test-conflict-raise-view.html" />