[Checkins] SVN: zope.app.preference/trunk/ Broke test dependency on ``zope.app.testing`` by using ``zope.app.wsgi.testlayer``.
Michael Howitz
mh at gocept.com
Sat Jul 10 05:23:28 EDT 2010
Log message for revision 114481:
Broke test dependency on ``zope.app.testing`` by using ``zope.app.wsgi.testlayer``.
Changed:
U zope.app.preference/trunk/CHANGES.txt
U zope.app.preference/trunk/setup.py
U zope.app.preference/trunk/src/zope/app/preference/README.txt
U zope.app.preference/trunk/src/zope/app/preference/testing.py
U zope.app.preference/trunk/src/zope/app/preference/tests.py
-=-
Modified: zope.app.preference/trunk/CHANGES.txt
===================================================================
--- zope.app.preference/trunk/CHANGES.txt 2010-07-10 09:22:16 UTC (rev 114480)
+++ zope.app.preference/trunk/CHANGES.txt 2010-07-10 09:23:28 UTC (rev 114481)
@@ -5,7 +5,8 @@
3.8.2 (unreleased)
------------------
-- Nothing changed yet.
+- Broke test dependency on ``zope.app.testing`` by using
+ ``zope.app.wsgi.testlayer``.
3.8.1 (2010-06-15)
Modified: zope.app.preference/trunk/setup.py
===================================================================
--- zope.app.preference/trunk/setup.py 2010-07-10 09:22:16 UTC (rev 114480)
+++ zope.app.preference/trunk/setup.py 2010-07-10 09:23:28 UTC (rev 114481)
@@ -56,7 +56,7 @@
package_dir = {'': 'src'},
namespace_packages=['zope', 'zope.app'],
extras_require=dict(test=[
- 'zope.app.testing',
+ 'zope.app.wsgi >= 3.7',
'zope.app.zcmlfiles',
]),
install_requires = ['setuptools',
Modified: zope.app.preference/trunk/src/zope/app/preference/README.txt
===================================================================
--- zope.app.preference/trunk/src/zope/app/preference/README.txt 2010-07-10 09:22:16 UTC (rev 114480)
+++ zope.app.preference/trunk/src/zope/app/preference/README.txt 2010-07-10 09:23:28 UTC (rev 114481)
@@ -10,7 +10,7 @@
To show the user interface functions we need some setup beforehand:
- >>> from zope.testbrowser.testing import Browser
+ >>> from zope.app.wsgi.testlayer import Browser
>>> browser = Browser()
As the preferences cannot be defined through the web we have to define
Modified: zope.app.preference/trunk/src/zope/app/preference/testing.py
===================================================================
--- zope.app.preference/trunk/src/zope/app/preference/testing.py 2010-07-10 09:22:16 UTC (rev 114480)
+++ zope.app.preference/trunk/src/zope/app/preference/testing.py 2010-07-10 09:23:28 UTC (rev 114481)
@@ -16,11 +16,7 @@
$Id$
"""
-__docformat__ = "reStructuredText"
+import zope.app.preference
+import zope.app.wsgi.testlayer
-import os
-from zope.app.testing.functional import ZCMLLayer
-
-PreferencesLayer = ZCMLLayer(
- os.path.join(os.path.split(__file__)[0], 'ftesting.zcml'),
- __name__, 'PreferencesLayer', allow_teardown=True)
+PreferencesLayer = zope.app.wsgi.testlayer.BrowserLayer(zope.app.preference)
Modified: zope.app.preference/trunk/src/zope/app/preference/tests.py
===================================================================
--- zope.app.preference/trunk/src/zope/app/preference/tests.py 2010-07-10 09:22:16 UTC (rev 114480)
+++ zope.app.preference/trunk/src/zope/app/preference/tests.py 2010-07-10 09:23:28 UTC (rev 114481)
@@ -15,23 +15,23 @@
$Id$
"""
-from zope.app.testing import setup, functional
-from zope.component import testing
-import unittest
+import doctest
import zope.app.preference.testing
+import zope.component.testing
+import zope.testing.module
def setUp(test):
- setup.setUpTestAsModule(test, 'zope.app.preference.README')
+ zope.testing.module.setUp(test, 'zope.app.preference.README')
def tearDown(test):
- testing.tearDown(test)
- setup.tearDownTestAsModule(test)
+ zope.component.testing.tearDown(test)
+ zope.testing.module.tearDown(test)
def test_suite():
- tests = functional.FunctionalDocFileSuite(
+ suite = doctest.DocFileSuite(
'README.txt', setUp=setUp, tearDown=tearDown)
- tests.layer = zope.app.preference.testing.PreferencesLayer
- return unittest.TestSuite((tests,))
+ suite.layer = zope.app.preference.testing.PreferencesLayer
+ return suite
More information about the checkins
mailing list