[Checkins] SVN: zope.applicationcontrol/trunk/s Instead of depending on zope.app.component, depend on zope.app.testing.
Martijn Faassen
faassen at startifact.com
Sat Jan 9 09:26:27 EST 2010
Log message for revision 107928:
Instead of depending on zope.app.component, depend on zope.app.testing.
Changed:
U zope.applicationcontrol/trunk/setup.py
D zope.applicationcontrol/trunk/src/zope/applicationcontrol/ftesting.zcml
D zope.applicationcontrol/trunk/src/zope/applicationcontrol/testing.py
U zope.applicationcontrol/trunk/src/zope/applicationcontrol/tests/test_runtimeinfo.py
-=-
Modified: zope.applicationcontrol/trunk/setup.py
===================================================================
--- zope.applicationcontrol/trunk/setup.py 2010-01-09 14:15:12 UTC (rev 107927)
+++ zope.applicationcontrol/trunk/setup.py 2010-01-09 14:26:26 UTC (rev 107928)
@@ -50,7 +50,6 @@
url='http://cheeseshop.python.org/pypi/zope.applicationcontrol',
extras_require=dict(
test=[
- 'zope.app.component',
'zope.app.testing',
]),
package_dir = {'': 'src'},
@@ -63,7 +62,6 @@
'zope.interface',
'zope.location',
'zope.security',
- 'zope.size',
'zope.traversing>=3.7.0',
],
include_package_data = True,
Deleted: zope.applicationcontrol/trunk/src/zope/applicationcontrol/ftesting.zcml
===================================================================
--- zope.applicationcontrol/trunk/src/zope/applicationcontrol/ftesting.zcml 2010-01-09 14:15:12 UTC (rev 107927)
+++ zope.applicationcontrol/trunk/src/zope/applicationcontrol/ftesting.zcml 2010-01-09 14:26:26 UTC (rev 107928)
@@ -1,42 +0,0 @@
-<configure
- xmlns="http://namespaces.zope.org/zope"
- i18n_domain="zope"
- package="zope.app.applicationcontrol"
- >
-
- <!-- This file is the equivalent of site.zcml and it is -->
- <!-- used for functional testing setup -->
-
- <include package="zope.securitypolicy" file="meta.zcml" />
-
- <include package="zope.app.zcmlfiles" />
- <include package="zope.app.authentication" />
- <include package="zope.app.securitypolicy" />
- <include package="zope.login" />
-
- <securityPolicy
- component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
-
- <role id="zope.Manager" title="Site Manager" />
-
- <grantAll role="zope.Manager" />
-
- <!-- Principal that tests generally run as -->
-
- <principal
- id="zope.manager"
- title="Manager"
- 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.manager" />
- <grant role="zope.Manager" principal="zope.globalmgr" />
-
-</configure>
Deleted: zope.applicationcontrol/trunk/src/zope/applicationcontrol/testing.py
===================================================================
--- zope.applicationcontrol/trunk/src/zope/applicationcontrol/testing.py 2010-01-09 14:15:12 UTC (rev 107927)
+++ zope.applicationcontrol/trunk/src/zope/applicationcontrol/testing.py 2010-01-09 14:26:26 UTC (rev 107928)
@@ -1,26 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2007 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-"""zope.app.applicationcontrol common test related classes/functions/objects.
-
-$Id$
-"""
-
-__docformat__ = "reStructuredText"
-
-import os
-from zope.app.testing.functional import ZCMLLayer
-
-ApplicationControlLayer = ZCMLLayer(
- os.path.join(os.path.split(__file__)[0], 'ftesting.zcml'),
- __name__, 'ApplicationControlLayer', allow_teardown=True)
Modified: zope.applicationcontrol/trunk/src/zope/applicationcontrol/tests/test_runtimeinfo.py
===================================================================
--- zope.applicationcontrol/trunk/src/zope/applicationcontrol/tests/test_runtimeinfo.py 2010-01-09 14:15:12 UTC (rev 107927)
+++ zope.applicationcontrol/trunk/src/zope/applicationcontrol/tests/test_runtimeinfo.py 2010-01-09 14:26:26 UTC (rev 107928)
@@ -27,13 +27,13 @@
from zope.interface.verify import verifyObject
from zope.applicationcontrol.applicationcontrol import applicationController
from zope.applicationcontrol.interfaces import IRuntimeInfo
-from zope.app.component.testing import PlacefulSetup
+from zope.app.testing.placelesssetup import PlacelessSetup
# seconds, time values may differ in order to be assumed equal
time_tolerance = 2
stupid_version_string = "3085t0klvn93850voids"
-class Test(PlacefulSetup, unittest.TestCase):
+class Test(PlacelessSetup, unittest.TestCase):
def _Test__new(self):
from zope.applicationcontrol.runtimeinfo import RuntimeInfo
More information about the checkins
mailing list