[Checkins] SVN: zope.traversing/trunk/ Removed testing dependency on zope.app.zcmlfiles in favor of more explicit dependencies.

Hanno Schlichting hannosch at hannosch.eu
Tue Dec 15 19:20:29 EST 2009


Log message for revision 106598:
  Removed testing dependency on zope.app.zcmlfiles in favor of more explicit dependencies.
  

Changed:
  U   zope.traversing/trunk/CHANGES.txt
  U   zope.traversing/trunk/setup.py
  U   zope.traversing/trunk/src/zope/traversing/tests/ftesting.zcml
  U   zope.traversing/trunk/src/zope/traversing/tests/test_vhosting.py

-=-
Modified: zope.traversing/trunk/CHANGES.txt
===================================================================
--- zope.traversing/trunk/CHANGES.txt	2009-12-15 23:38:32 UTC (rev 106597)
+++ zope.traversing/trunk/CHANGES.txt	2009-12-16 00:20:28 UTC (rev 106598)
@@ -5,6 +5,9 @@
 3.10.0 (unreleased)
 -------------------
 
+- Removed testing dependency on zope.app.zcmlfiles in favor of more explicit
+  dependencies.
+
 - Removed testing dependency on zope.app.component.
 
 - Replaced a test dependency on zope.app.zptpage with a dependency on

Modified: zope.traversing/trunk/setup.py
===================================================================
--- zope.traversing/trunk/setup.py	2009-12-15 23:38:32 UTC (rev 106597)
+++ zope.traversing/trunk/setup.py	2009-12-16 00:20:28 UTC (rev 106598)
@@ -40,7 +40,6 @@
       namespace_packages=['zope',],
       extras_require = dict(test=['zope.app.testing',
                                   'zope.app.securitypolicy',
-                                  'zope.app.zcmlfiles',
                                   'zope.app.applicationcontrol>=3.5.0',
                                   'zope.container',
                                   'zope.pagetemplate',

Modified: zope.traversing/trunk/src/zope/traversing/tests/ftesting.zcml
===================================================================
--- zope.traversing/trunk/src/zope/traversing/tests/ftesting.zcml	2009-12-15 23:38:32 UTC (rev 106597)
+++ zope.traversing/trunk/src/zope/traversing/tests/ftesting.zcml	2009-12-16 00:20:28 UTC (rev 106598)
@@ -5,12 +5,36 @@
    package="zope.traversing"
    >
 
-  <!-- This file is the equivalent of site.zcml and it is -->
-  <!-- used for functional testing setup -->
+  <include package="zope.browserpage" file="meta.zcml" />
+  <include package="zope.component" file="meta.zcml" />
+  <include package="zope.publisher" file="meta.zcml" />
+  <include package="zope.security" file="meta.zcml" />
+  <include package="zope.app.publication" file="meta.zcml" />
+  <include package="zope.app.securitypolicy" file="meta.zcml" />
 
-  <include package="zope.app.zcmlfiles" />
+  <include package="zope.browserresource" />
+  <include package="zope.container" />
+  <include package="zope.location" />
+  <include package="zope.principalregistry" />
+  <include package="zope.publisher" />
+  <include package="zope.security" />
+  <include package="zope.site" />
+  <include package="zope.traversing" />
 
+  <include package="zope.app.appsetup" />
+  <include package="zope.app.publication" />
+
+  <browser:defaultView name="index.html" />
+  <include package="zope.traversing.browser" />
+
   <browser:page
+      for="zope.site.interfaces.IFolder"
+      permission="zope.View"
+      class="zope.traversing.tests.test_vhosting.MyFolderPage"
+      name="index.html" attribute="index"
+      />
+
+  <browser:page
       name="index.html"
       for="zope.traversing.tests.test_vhosting.MyPageTemplate"
       class="zope.traversing.tests.test_vhosting.MyPageEval"
@@ -30,13 +54,6 @@
 
   <!-- Principals -->
 
-  <unauthenticatedPrincipal
-      id="zope.anybody"
-      title="Unauthenticated User" />
-
-
-  <include package="zope.app.securitypolicy" file="meta.zcml" />
-
   <securityPolicy
     component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
 

Modified: zope.traversing/trunk/src/zope/traversing/tests/test_vhosting.py
===================================================================
--- zope.traversing/trunk/src/zope/traversing/tests/test_vhosting.py	2009-12-15 23:38:32 UTC (rev 106597)
+++ zope.traversing/trunk/src/zope/traversing/tests/test_vhosting.py	2009-12-16 00:20:28 UTC (rev 106598)
@@ -62,6 +62,14 @@
         return template.render(template.__parent__, request, **kw)
 
 
+class MyFolderPage(object):
+
+    def index(self, **kw):
+        """My folder page"""
+        self.request.response.redirect('index.html')
+        return ''
+
+
 class TestVirtualHosting(functional.BrowserTestCase):
 
     layer = TraversingLayer



More information about the checkins mailing list