[Checkins] SVN: zamplugin.control/trunk/ - Updated test setup, tests and demo application to run with ZTK 1.0, thus
Michael Howitz
mh at gocept.com
Thu Feb 3 02:54:49 EST 2011
Log message for revision 120071:
- Updated test setup, tests and demo application to run with ZTK 1.0, thus
requiring ``zam.api`` >= 0.7.
- Depending on ``zope.applicationcontrol`` instead of
``zope.app.applicationcontrol``.
Changed:
U zamplugin.control/trunk/CHANGES.txt
U zamplugin.control/trunk/buildout.cfg
U zamplugin.control/trunk/setup.py
U zamplugin.control/trunk/src/zamplugin/control/README.txt
U zamplugin.control/trunk/src/zamplugin/control/app.zcml
U zamplugin.control/trunk/src/zamplugin/control/browser/configure.zcml
U zamplugin.control/trunk/src/zamplugin/control/ftesting.zcml
U zamplugin.control/trunk/src/zamplugin/control/tests.py
-=-
Modified: zamplugin.control/trunk/CHANGES.txt
===================================================================
--- zamplugin.control/trunk/CHANGES.txt 2011-02-03 07:01:27 UTC (rev 120070)
+++ zamplugin.control/trunk/CHANGES.txt 2011-02-03 07:54:48 UTC (rev 120071)
@@ -5,9 +5,13 @@
Version 0.5.1dev (unreleased)
-------------------------
-- ...
+- Updated test setup, tests and demo application to run with ZTK 1.0, thus
+ requiring ``zam.api`` >= 0.7.
-Version 0.5.0 (2008-04-14)
--------------------------
+- Depending on ``zope.applicationcontrol`` instead of
+ ``zope.app.applicationcontrol``.
-- Initial Release
+0.5.0 (2008-04-14)
+------------------
+
+- Initial release.
Modified: zamplugin.control/trunk/buildout.cfg
===================================================================
--- zamplugin.control/trunk/buildout.cfg 2011-02-03 07:01:27 UTC (rev 120070)
+++ zamplugin.control/trunk/buildout.cfg 2011-02-03 07:54:48 UTC (rev 120071)
@@ -90,7 +90,7 @@
</configure>
-principals.zcml =
+principals.zcml =
<unauthenticatedPrincipal
id="lovelybooks.anybody"
title="Unauthenticated User"
@@ -124,7 +124,7 @@
/>
securitypolicy.zcml =
- <include package="zope.app.securitypolicy" />
+ <include package="zope.securitypolicy" />
<securityPolicy
component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
@@ -140,7 +140,7 @@
role="zope.Anonymous"
/>
<grant
- permission="zope.app.dublincore.view"
+ permission="zope.dublincore.view"
role="zope.Anonymous"
/>
Modified: zamplugin.control/trunk/setup.py
===================================================================
--- zamplugin.control/trunk/setup.py 2011-02-03 07:01:27 UTC (rev 120070)
+++ zamplugin.control/trunk/setup.py 2011-02-03 07:54:48 UTC (rev 120071)
@@ -25,7 +25,7 @@
name='zamplugin.control',
version='0.5.1dev',
author = "Roger Ineichen and the Zope Community",
- author_email = "zope3-dev at zope.org",
+ author_email = "zope-dev at zope.org",
description = "Error utility for Zope Application Management",
long_description=(
read('README.txt')
@@ -44,7 +44,7 @@
'Operating System :: OS Independent',
'Topic :: Internet :: WWW/HTTP',
'Framework :: Zope3'],
- url = 'http://cheeseshop.python.org/pypi/zamplugin.control',
+ url = 'http://pypi.python.org/pypi/zamplugin.control',
packages = find_packages('src'),
include_package_data = True,
package_dir = {'':'src'},
@@ -54,6 +54,7 @@
'z3c.coverage',
'z3c.testing',
'zope.app.testing',
+ 'zope.app.zopeappgenerations', # needed by a test
'zope.testbrowser',
],
),
@@ -63,11 +64,14 @@
'z3c.menu.ready2go',
'z3c.pagelet',
'z3c.template',
- 'zam.api',
- 'zope.app.applicationcontrol',
+ 'zam.api >= 0.7',
+ 'zam.skin >= 0.8',
'zope.app.generations',
'zope.app.renderer',
+ 'zope.applicationcontrol',
'zope.component',
+ 'zope.configuration >= 3.5',
+ 'zope.dublincore >= 3.7',
'zope.interface',
'zope.location',
'zope.size',
Modified: zamplugin.control/trunk/src/zamplugin/control/README.txt
===================================================================
--- zamplugin.control/trunk/src/zamplugin/control/README.txt 2011-02-03 07:01:27 UTC (rev 120070)
+++ zamplugin.control/trunk/src/zamplugin/control/README.txt 2011-02-03 07:54:48 UTC (rev 120071)
@@ -2,7 +2,7 @@
README
======
-This package provides the server control management. The zam.skin is used as
+This package provides the server control management. The zam.skin is used as
basic skin for this test.
First login as manager:
@@ -13,18 +13,15 @@
Check if we can access the management namespace without the installed plugin:
- >>> mgr = Browser()
- >>> mgr.handleErrors = False
- >>> mgr.addHeader('Authorization', 'Basic mgr:mgrpw')
>>> rootURL = 'http://localhost/++skin++ZAM'
>>> mgr.open(rootURL + '/++etc++ApplicationController')
- >>> mgr.url
- 'http://localhost/++skin++ZAM/++etc++ApplicationController'
+ Traceback (most recent call last):
+ HTTPError: HTTP Error 404: Not Found
-As you can see there is no real page available only the default one from the
+As you can see there is no real page available only the default one from the
skin configuration which shows the following message:
- >>> 'There is no index.html page registered for this object' in mgr.contents
+ >>> 'The page you are trying to access is not available' in mgr.contents
True
Go to the plugins page at the site root:
@@ -101,7 +98,7 @@
</html>
-The ZODB control page allows you to pack the Database and shows the current
+The ZODB control page allows you to pack the Database and shows the current
database size:
>>> mgr.open(rootURL + '/++etc++ApplicationController/ZODBControl.html')
@@ -150,7 +147,7 @@
</div>
...
-The generation page shows you pending generations and will list already
+The generation page shows you pending generations and will list already
processed generation steps:
>>> mgr.open(rootURL + '/++etc++ApplicationController/generations.html')
Modified: zamplugin.control/trunk/src/zamplugin/control/app.zcml
===================================================================
--- zamplugin.control/trunk/src/zamplugin/control/app.zcml 2011-02-03 07:01:27 UTC (rev 120070)
+++ zamplugin.control/trunk/src/zamplugin/control/app.zcml 2011-02-03 07:54:48 UTC (rev 120071)
@@ -3,17 +3,11 @@
xmlns="http://namespaces.zope.org/zope"
i18n_domain="zope">
- <!-- load meta configuration for exclude -->
- <include package="zc.configuration" file="meta.zcml" />
-
- <!-- use app configuration from zam.api -->
+ <!-- use app configuration from zam.skin -->
<include package="zam.skin" file="app.zcml" />
- <!-- exclude will prevent from include -->
- <exclude package="zope.app.applicationcontrol.browser" />
-
<!-- zope app package configuration -->
- <include package="zope.app.applicationcontrol" />
+ <include package="zope.applicationcontrol" />
<!-- zam skin configuration -->
<include package="zamplugin.control" />
Modified: zamplugin.control/trunk/src/zamplugin/control/browser/configure.zcml
===================================================================
--- zamplugin.control/trunk/src/zamplugin/control/browser/configure.zcml 2011-02-03 07:01:27 UTC (rev 120070)
+++ zamplugin.control/trunk/src/zamplugin/control/browser/configure.zcml 2011-02-03 07:54:48 UTC (rev 120071)
@@ -6,7 +6,7 @@
<!-- runtime info -->
<z3c:pagelet
name="index.html"
- for="zope.app.applicationcontrol.interfaces.IApplicationControl"
+ for="zope.applicationcontrol.interfaces.IApplicationControl"
class=".runtimeinfo.RuntimeInfo"
permission="zope.ManageApplication"
layer="zam.api.layer.IControlPluginLayer"
@@ -22,7 +22,7 @@
<!-- ZODB control -->
<z3c:pagelet
name="ZODBControl.html"
- for="zope.app.applicationcontrol.interfaces.IApplicationControl"
+ for="zope.applicationcontrol.interfaces.IApplicationControl"
class=".zodbcontrol.ZODBControl"
permission="zope.ManageApplication"
layer="zam.api.layer.IControlPluginLayer"
@@ -38,7 +38,7 @@
<!-- generations -->
<z3c:pagelet
name="generations.html"
- for="zope.app.applicationcontrol.interfaces.IApplicationControl"
+ for="zope.applicationcontrol.interfaces.IApplicationControl"
class=".generation.Generations"
permission="zope.ManageApplication"
layer="zam.api.layer.IControlPluginLayer"
@@ -52,7 +52,7 @@
<z3c:pagelet
name="generationDetails.html"
- for="zope.app.applicationcontrol.interfaces.IApplicationControl"
+ for="zope.applicationcontrol.interfaces.IApplicationControl"
class=".generation.GenerationDetails"
permission="zope.ManageApplication"
layer="zam.api.layer.IControlPluginLayer"
Modified: zamplugin.control/trunk/src/zamplugin/control/ftesting.zcml
===================================================================
--- zamplugin.control/trunk/src/zamplugin/control/ftesting.zcml 2011-02-03 07:01:27 UTC (rev 120070)
+++ zamplugin.control/trunk/src/zamplugin/control/ftesting.zcml 2011-02-03 07:54:48 UTC (rev 120071)
@@ -6,10 +6,15 @@
<!-- Turn on the devmode -->
<meta:provides feature="devmode" />
- <!-- use ftesting configuration from zam.api -->
- <include package="zam.skin" file="ftesting.zcml" />
<!-- load app configuration -->
<include package="zamplugin.control" file="app.zcml" />
+ <!-- use ftesting configuration from zam.skin -->
+ <include package="zam.skin" file="ftesting.zcml" />
+
+ <!-- zope.app.zopeappgenerations' generations are expected by test -->
+ <include package="zope.app.zopeappgenerations" />
+
+
</configure>
Modified: zamplugin.control/trunk/src/zamplugin/control/tests.py
===================================================================
--- zamplugin.control/trunk/src/zamplugin/control/tests.py 2011-02-03 07:01:27 UTC (rev 120070)
+++ zamplugin.control/trunk/src/zamplugin/control/tests.py 2011-02-03 07:54:48 UTC (rev 120071)
@@ -11,23 +11,13 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""
-$Id: __init__.py 97 2007-03-29 22:58:27Z rineichen $
-"""
-
-import unittest
from zope.app.testing import functional
functional.defineLayer('TestLayer', 'ftesting.zcml')
def test_suite():
- suite = unittest.TestSuite()
s = functional.FunctionalDocFileSuite('README.txt')
s.layer = TestLayer
- suite.addTest(s)
- return suite
-
-if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
+ return s
More information about the checkins
mailing list