[Zconfig] SVN: ZConfig/trunk/ update to use zope.testrunner

[Fred Drake]

Log message for revision 114724:
  update to use zope.testrunner
  https://bugs.launchpad.net/zconfig/+bug/605179
  

Changed:
  U   ZConfig/trunk/ZConfig/tests/test_readme.py
  U   ZConfig/trunk/buildout.cfg
  U   ZConfig/trunk/setup.py

-=-
Modified: ZConfig/trunk/ZConfig/tests/test_readme.py
===================================================================
--- ZConfig/trunk/ZConfig/tests/test_readme.py	2010-07-13 22:24:39 UTC (rev 114723)
+++ ZConfig/trunk/ZConfig/tests/test_readme.py	2010-07-14 05:09:26 UTC (rev 114724)
@@ -11,16 +11,17 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-import logging,os,unittest
-from zope.testing.doctest import DocFileSuite, REPORT_NDIFF,ELLIPSIS
+import doctest
+import logging
 
-options = REPORT_NDIFF|ELLIPSIS
 
+options = doctest.REPORT_NDIFF | doctest.ELLIPSIS
+
 old = {}
 def setUp(test):
     global old
-    logger=logging.getLogger()
-    old['level']=logger.level
+    logger = logging.getLogger()
+    old['level'] = logger.level
     old['handlers'] = logger.handlers[:]
 
 def tearDown(test):
@@ -29,7 +30,8 @@
     logger.handlers = old['handlers']
 
 def test_suite():
-    return unittest.TestSuite((
-        DocFileSuite('../../README.txt', optionflags=options,
-                     setUp=setUp,tearDown=tearDown),
-        ))
+    return doctest.DocFileSuite(
+        '../../README.txt',
+        optionflags=options,
+        setUp=setUp, tearDown=tearDown,
+        )

Modified: ZConfig/trunk/buildout.cfg
===================================================================
--- ZConfig/trunk/buildout.cfg	2010-07-13 22:24:39 UTC (rev 114723)
+++ ZConfig/trunk/buildout.cfg	2010-07-14 05:09:26 UTC (rev 114724)
@@ -2,6 +2,7 @@
 develop = .
 find-links = http://download.zope.org/distribution/
 parts = test
+prefer-final = true
 
 [test]
 recipe = zc.recipe.testrunner

Modified: ZConfig/trunk/setup.py
===================================================================
--- ZConfig/trunk/setup.py	2010-07-13 22:24:39 UTC (rev 114723)
+++ ZConfig/trunk/setup.py	2010-07-14 05:09:26 UTC (rev 114724)
@@ -4,19 +4,17 @@
 def alltests():
     import os
     import sys
-    from unittest import TestSuite
-    # use the zope.testing testrunner machinery to find all the
+    import unittest
+    # use the zope.testrunner machinery to find all the
     # test suites we've put under ourselves
-    from zope.testing.testrunner import get_options
-    from zope.testing.testrunner import find_suites
-    from zope.testing.testrunner import configure_logging
-    configure_logging()
+    import zope.testrunner.find
+    import zope.testrunner.options
     here = os.path.abspath(os.path.dirname(sys.argv[0]))
     args = sys.argv[:]
     defaults = ["--test-path", here]
-    options = get_options(args, defaults)
-    suites = list(find_suites(options))
-    return TestSuite(suites)
+    options = zope.testrunner.options.get_options(args, defaults)
+    suites = list(zope.testrunner.find.find_suites(options))
+    return unittest.TestSuite(suites)
 
 options = dict(
     name="ZConfig",
@@ -58,7 +56,7 @@
     # Support for 'setup.py test' when setuptools is available:
     test_suite="__main__.alltests",
     tests_require=[
-        "zope.testing",
+        "zope.testrunner",
         ],
     )