[Checkins] SVN: zope.app.appsetup/branches/3.14/ - Updated tests to run with `zope.testing >= 3.10`, requiring at least this

[Michael Howitz]

Log message for revision 116888:
  - Updated tests to run with `zope.testing >= 3.10`, requiring at least this
    version and `zope.testrunner`.
  
  - Using Python's ``doctest`` module instead of depreacted
    ``zope.testing.doctest``.
  
  

Changed:
  U   zope.app.appsetup/branches/3.14/CHANGES.txt
  U   zope.app.appsetup/branches/3.14/setup.py
  U   zope.app.appsetup/branches/3.14/src/zope/app/appsetup/testlayer.txt
  U   zope.app.appsetup/branches/3.14/src/zope/app/appsetup/tests.py

-=-
Modified: zope.app.appsetup/branches/3.14/CHANGES.txt
===================================================================
--- zope.app.appsetup/branches/3.14/CHANGES.txt	2010-09-25 12:54:04 UTC (rev 116887)
+++ zope.app.appsetup/branches/3.14/CHANGES.txt	2010-09-25 13:00:08 UTC (rev 116888)
@@ -4,13 +4,19 @@
 3.14.1 (unreleased)
 -------------------
 
+- Updated tests to run with `zope.testing >= 3.10`, requiring at least this
+  version and `zope.testrunner`.
 
+- Using Python's ``doctest`` module instead of depreacted
+  ``zope.testing.doctest``.
+
+
 3.14.0 (2010-04-13)
 -------------------
 
-- make zope.testing an optional (test) dependency.
+- Made `zope.testing` an optional (test) dependency.
 
-- remove test dependency zope.app.testing. 
+- Removed test dependency on `zope.app.testing`.
 
 
 3.13.0 (2009-12-24)

Modified: zope.app.appsetup/branches/3.14/setup.py
===================================================================
--- zope.app.appsetup/branches/3.14/setup.py	2010-09-25 12:54:04 UTC (rev 116887)
+++ zope.app.appsetup/branches/3.14/setup.py	2010-09-25 13:00:08 UTC (rev 116888)
@@ -66,7 +66,8 @@
         test=[
             'zope.componentvocabulary',
             'zope.principalregistry',
-            'zope.testing',
+            'zope.testing >= 3.10',
+            'zope.testrunner',
             ]
         ),
     namespace_packages=['zope', 'zope.app'],

Modified: zope.app.appsetup/branches/3.14/src/zope/app/appsetup/testlayer.txt
===================================================================
--- zope.app.appsetup/branches/3.14/src/zope/app/appsetup/testlayer.txt	2010-09-25 12:54:04 UTC (rev 116887)
+++ zope.app.appsetup/branches/3.14/src/zope/app/appsetup/testlayer.txt	2010-09-25 13:00:08 UTC (rev 116888)
@@ -52,7 +52,7 @@
 
 And run that suite:
 
-  >>> from zope.testing.testrunner.runner import Runner
+  >>> from zope.testrunner.runner import Runner
   >>> runner = Runner(args=[], found_suites=[suite])
   >>> succeeded = runner.run()
   Running zope.app.appsetup.testpackage.ZODBLayer tests:

Modified: zope.app.appsetup/branches/3.14/src/zope/app/appsetup/tests.py
===================================================================
--- zope.app.appsetup/branches/3.14/src/zope/app/appsetup/tests.py	2010-09-25 12:54:04 UTC (rev 116887)
+++ zope.app.appsetup/branches/3.14/src/zope/app/appsetup/tests.py	2010-09-25 13:00:08 UTC (rev 116888)
@@ -16,16 +16,16 @@
 $Id$
 """
 import ZConfig
+import doctest
 import os
 import sys
+import transaction
 import unittest
 import urllib
-import transaction
 
 import zope.component
 
 from ZODB.tests.util import DB
-from zope.testing import doctest
 from zope.traversing.api import traverse, getPath
 from zope.error.interfaces import IErrorReportingUtility
 from zope.error.error import ErrorReportingUtility