[Checkins] SVN: z3c.traverser/trunk/ - Updated test set up to run with ZTK 1.0.
Michael Howitz
mh at gocept.com
Mon Nov 1 03:24:14 EDT 2010
Log message for revision 118041:
- Updated test set up to run with ZTK 1.0.
- Using Python's ``doctest`` module instead of depreacted
``zope.testing.doctest[unit]``.
Changed:
U z3c.traverser/trunk/CHANGES.txt
U z3c.traverser/trunk/src/z3c/traverser/stackinfo/ftesting.zcml
U z3c.traverser/trunk/src/z3c/traverser/stackinfo/tests.py
U z3c.traverser/trunk/src/z3c/traverser/tests.py
U z3c.traverser/trunk/src/z3c/traverser/viewlet/ftesting.zcml
U z3c.traverser/trunk/src/z3c/traverser/viewlet/tests.py
-=-
Modified: z3c.traverser/trunk/CHANGES.txt
===================================================================
--- z3c.traverser/trunk/CHANGES.txt 2010-11-01 07:23:53 UTC (rev 118040)
+++ z3c.traverser/trunk/CHANGES.txt 2010-11-01 07:24:14 UTC (rev 118041)
@@ -5,8 +5,12 @@
0.2.6 (unreleased)
------------------
-- ...
+- Updated test set up to run with ZTK 1.0.
+- Using Python's ``doctest`` module instead of depreacted
+ ``zope.testing.doctest[unit]``.
+
+
0.2.5 (2009-03-13)
------------------
Modified: z3c.traverser/trunk/src/z3c/traverser/stackinfo/ftesting.zcml
===================================================================
--- z3c.traverser/trunk/src/z3c/traverser/stackinfo/ftesting.zcml 2010-11-01 07:23:53 UTC (rev 118040)
+++ z3c.traverser/trunk/src/z3c/traverser/stackinfo/ftesting.zcml 2010-11-01 07:24:14 UTC (rev 118041)
@@ -12,7 +12,7 @@
package="zope.app"
/>
- <include package="zope.app.securitypolicy" file="meta.zcml" />
+ <include package="zope.securitypolicy" file="meta.zcml" />
<include package="zope.app.authentication" />
@@ -60,9 +60,5 @@
<grant permission="zope.View"
role="zope.Anonymous" />
- <grant permission="zope.app.dublincore.view"
- role="zope.Anonymous" />
-
-
</configure>
Modified: z3c.traverser/trunk/src/z3c/traverser/stackinfo/tests.py
===================================================================
--- z3c.traverser/trunk/src/z3c/traverser/stackinfo/tests.py 2010-11-01 07:23:53 UTC (rev 118040)
+++ z3c.traverser/trunk/src/z3c/traverser/stackinfo/tests.py 2010-11-01 07:24:14 UTC (rev 118041)
@@ -1,6 +1,5 @@
import doctest
import unittest
-from zope.testing.doctestunit import DocFileSuite, DocFileSuite
from zope.app.testing import setup
from zope.component import provideAdapter
from zope.interface import Interface
@@ -20,14 +19,7 @@
setup.placefulTearDown()
def test_suite():
-
- return unittest.TestSuite(
- (
- DocFileSuite('README.txt',
- setUp=setUp, tearDown=tearDown,
- optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
- ),
- ))
-
-if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
+ return doctest.DocFileSuite(
+ 'README.txt',
+ setUp=setUp, tearDown=tearDown,
+ optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS)
Modified: z3c.traverser/trunk/src/z3c/traverser/tests.py
===================================================================
--- z3c.traverser/trunk/src/z3c/traverser/tests.py 2010-11-01 07:23:53 UTC (rev 118040)
+++ z3c.traverser/trunk/src/z3c/traverser/tests.py 2010-11-01 07:24:14 UTC (rev 118041)
@@ -11,28 +11,20 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""Pluggable Traverser Tests
-
-$Id$
-"""
-__docformat__ = "reStructuredText"
+"""Pluggable Traverser Tests"""
+from zope.component import testing
+import doctest
import unittest
-from zope.testing import doctest
-from zope.component import testing
-
def test_suite():
return unittest.TestSuite((
doctest.DocFileSuite(
- 'README.txt',
- setUp=testing.setUp, tearDown=testing.tearDown,
- optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS),
- doctest.DocFileSuite(
- 'namespace.txt',
- setUp=testing.setUp, tearDown=testing.tearDown,
- optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS),
+ 'README.txt',
+ setUp=testing.setUp, tearDown=testing.tearDown,
+ optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS),
+ doctest.DocFileSuite(
+ 'namespace.txt',
+ setUp=testing.setUp, tearDown=testing.tearDown,
+ optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS),
))
-
-if __name__ == '__main__':
- unittest.main(default='test_suite')
Modified: z3c.traverser/trunk/src/z3c/traverser/viewlet/ftesting.zcml
===================================================================
--- z3c.traverser/trunk/src/z3c/traverser/viewlet/ftesting.zcml 2010-11-01 07:23:53 UTC (rev 118040)
+++ z3c.traverser/trunk/src/z3c/traverser/viewlet/ftesting.zcml 2010-11-01 07:24:14 UTC (rev 118041)
@@ -15,7 +15,7 @@
<include package="zope.viewlet" file="meta.zcml"/>
- <include package="zope.app.securitypolicy" file="meta.zcml" />
+ <include package="zope.securitypolicy" file="meta.zcml" />
<include package="zope.app.authentication" />
Modified: z3c.traverser/trunk/src/z3c/traverser/viewlet/tests.py
===================================================================
--- z3c.traverser/trunk/src/z3c/traverser/viewlet/tests.py 2010-11-01 07:23:53 UTC (rev 118040)
+++ z3c.traverser/trunk/src/z3c/traverser/viewlet/tests.py 2010-11-01 07:24:14 UTC (rev 118041)
@@ -3,7 +3,6 @@
import zope.traversing.testing
from zope.app.testing import setup
-from zope.testing.doctestunit import DocFileSuite, DocFileSuite
from zope.traversing.browser import AbsoluteURL, SiteAbsoluteURL
from zope.traversing.browser.interfaces import IAbsoluteURL
from zope.traversing.interfaces import IContainmentRoot
@@ -23,14 +22,7 @@
setup.placefulTearDown()
def test_suite():
-
- return unittest.TestSuite(
- (
- DocFileSuite('README.txt',
- setUp=setUp, tearDown=tearDown,
- optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
- ),
- ))
-
-if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
+ return doctest.DocFileSuite(
+ 'README.txt',
+ setUp=setUp, tearDown=tearDown,
+ optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS)
More information about the checkins
mailing list