Merge lp:~jml/launchpad/new-zope-testing into lp:launchpad

[Jonathan Lange]

Upgrade zope.testing to 3.9.2, delete our crufty subunit support

This branch upgrades zope.testing to 3.9.2 and subunit to 0.0.5. The new zope.testing comes with vastly better subunit support than the hacky stuff that's in the Launchpad tree, so I deleted the stuff in the Launchpad tree.

subunit is now managed with buildout using the cmmi recipe. I didn't really know what I was doing here, but it seems to work.

[Paul Hummer (rockstar)]

Wow, 14 new lines, but 106 removed? Can we have more patches like this? I'm quite happy to have subunit output.

review: Approve (code)

=== modified file 'buildout-templates/bin/test.in'
--- buildout-templates/bin/test.in	2010-02-24 16:44:39 +0000
+++ buildout-templates/bin/test.in	2010-04-13 10:36:35 +0000
@@ -97,6 +97,9 @@
     'ignore', 'twisted.python.plugin', DeprecationWarning,
     )
 warnings.filterwarnings(
+    'ignore', 'zope.testing.doctest', DeprecationWarning,
+    )
+warnings.filterwarnings(
     'ignore', 'bzrlib.*was deprecated', DeprecationWarning
 )
 # The next one is caused by a lamosity in python-openid.  The following change
@@ -164,14 +167,7 @@
 os.listdir = listdir
 
 
-from canonical.testing.customresult import (
-    filter_tests,
-    list_tests,
-    patch_find_tests,
-    patch_zope_testresult,
-    replace_list_of_tests,
-    )
-from subunit import TestProtocolClient
+from canonical.testing.customresult import filter_tests, patch_find_tests
 
 
 if __name__ == '__main__':
@@ -195,41 +191,10 @@
     options.parser.add_option(
         '--load-list', type=str, action='callback', callback=load_list)
 
-    def list_test_option(option, opt, value, parser):
-        patch_find_tests(list_tests)
-    options.parser.add_option(
-        '--list', action='callback', callback=list_test_option)
-
-    def save_list_test_option(option, opt, value, parser):
-        # Replace zope.testing's list_of_tests() method with our own
-        # that prints test IDs to the file given at the command line.
-        replace_list_of_tests(open(value, 'wb'))
-        # Get zope.testing to produce a listing. This works because
-        # this option parser is actually called twice, once here and
-        # once again within zope.testing.
-        args.append('--list-tests')
-    options.parser.add_option(
-        '--save-list', action='callback',
-        callback=save_list_test_option, type="str")
-
-    def use_subunit(option, opt, value, parser):
-        patch_zope_testresult(TestProtocolClient(sys.stdout))
-    options.parser.add_option(
-        '--subunit', action='callback', callback=use_subunit)
-
     # tests_pattern is a regexp, so the parsed value is hard to compare
     # with the default value in the loop below.
     options.parser.defaults['tests_pattern'] = defaults['tests_pattern']
     local_options = options.get_options(args=args)
-    if os.getenv("SUBUNIT_FORMATTER"):
-        try:
-            from subunit import get_default_formatter
-        except ImportError:
-            # Not a new enough subunit
-            pass
-        else:
-            stream = get_default_formatter()
-            patch_zope_testresult(TestProtocolClient(stream))
     # Set our default options, if the options aren't specified.
     for name, value in defaults.items():
         parsed_option = getattr(local_options, name)
 
=== modified file 'lib/canonical/launchpad/webapp/metazcml.py'
--- lib/canonical/launchpad/webapp/metazcml.py	2010-01-09 00:27:05 +0000
+++ lib/canonical/launchpad/webapp/metazcml.py	2010-04-13 10:36:35 +0000
@@ -8,11 +8,11 @@
 import zope.app.form.browser.metadirectives
 import zope.app.publisher.browser.metadirectives
 import zope.configuration.config
-from zope.app.component.metaconfigure import PublicPermission, view
 from zope.app.file.image import Image
 from zope.app.pagetemplate.engine import TrustedEngine
 from zope.component import getUtility
-from zope.component.zcml import adapter, handler, utility
+from zope.component.security import PublicPermission
+from zope.component.zcml import adapter, handler, utility, view
 from zope.configuration.fields import (
     GlobalInterface, GlobalObject, Path, PythonIdentifier, Tokens)
 from zope.interface import Interface, implements
 
=== modified file 'lib/canonical/testing/customresult.py'
--- lib/canonical/testing/customresult.py	2009-12-07 10:24:26 +0000
+++ lib/canonical/testing/customresult.py	2010-04-13 10:36:35 +0000
@@ -6,29 +6,12 @@
 __metaclass__ = type
 __all__ = [
     'filter_tests',
-    'list_tests',
     'patch_find_tests',
-    'patch_zope_testresult',
-    'replace_list_of_tests',
     ]
 
 from unittest import TestSuite
-from testtools import MultiTestResult, iterate_tests
-from zope.testing.testrunner import find, formatter, runner
-
-
-class NullOutputFormatter:
-    """A Zope test result OutputFormatter that prints *nothing*.
-
-    This is used to suppress much of the output from the Zope testrunner.
-    """
-
-    # Ideally, this would implement the interface of OutputFormatter and
-    # override all of the methods. Sadly, the interface is massive and not
-    # well-defined.
-
-    def __getattr__(self, name):
-        return lambda *args, **kwargs: None
+from testtools import iterate_tests
+from zope.testing.testrunner import find
 
 
 def patch_find_tests(hook):
@@ -46,14 +29,6 @@
     find.find_tests = find_tests
 
 
-def list_tests(tests_by_layer_name):
-    """Print all test ids in the result of `testrunner.find_tests`."""
-    for suite in tests_by_layer_name.itervalues():
-        for test in iterate_tests(suite):
-            print test.id()
-    return {}
-
-
 def filter_tests(list_name):
     """Create a hook for `patch_find_tests` that filters tests based on id.
 
@@ -74,41 +49,3 @@
                 result[layer_name] = new_suite
         return result
     return do_filter
-
-
-def patch_zope_testresult(result):
-    """Patch the Zope test result factory so that our test result is used.
-
-    We need to keep using the Zope test result object since it does all sorts
-    of crazy things to make layers work. So that the output of our result
-    object is used, we disable the output of the Zope test result object.
-
-    :param result: A TestResult instance.
-    """
-    old_zope_factory = runner.TestResult
-    def zope_result_factory(options, tests, layer_name=None):
-        zope_result = old_zope_factory(options, tests, layer_name=layer_name)
-        if isinstance(zope_result, MultiTestResult):
-            return zope_result
-        else:
-            zope_result.options.output = NullOutputFormatter()
-            return MultiTestResult(result, zope_result)
-    runner.TestResult = zope_result_factory
-
-
-def replace_list_of_tests(out_file):
-    """Replace OutputFormatter.list_of_tests.
-
-    This is so we can obtain the list of tests that zope.testing
-    thinks should be run, after considering layers, etc. It also
-    prints test.id() rather than str(test).
-
-    :param out_file: A writeable file where the list IDs can be
-        written to.
-    """
-    def list_of_tests(formatter, tests, layer_name):
-        """Report a list of test ids."""
-        print "Saving %s tests." % layer_name
-        for test in tests:
-            out_file.write(test.id() + "\n")
-    formatter.OutputFormatter.list_of_tests = list_of_tests
 
=== removed symlink 'lib/subunit'
=== target was u'../sourcecode/subunit/python/subunit'
=== modified file 'utilities/sourcedeps.conf'
--- utilities/sourcedeps.conf	2010-04-09 06:10:36 +0000
+++ utilities/sourcedeps.conf	2010-04-13 10:36:35 +0000
@@ -12,7 +12,6 @@
 old_xmlplus lp:~launchpad-pqm/dtdparser/trunk;revno=4
 pygettextpo lp:~launchpad-pqm/pygettextpo/trunk;revno=23
 pygpgme lp:~launchpad-pqm/pygpgme/devel;revno=48
-subunit lp:~launchpad-pqm/subunit/trunk;revno=61
 subvertpy lp:~launchpad-pqm/subvertpy/trunk;revno=2040
 testresources lp:~launchpad-pqm/testresources/dev;revno=16
 shipit lp:~launchpad-pqm/shipit/trunk;revno=8904 optional
 
=== modified file 'versions.cfg'
--- versions.cfg	2010-03-25 18:06:39 +0000
+++ versions.cfg	2010-04-13 10:36:35 +0000
@@ -152,7 +152,7 @@
 zope.app.server = 3.4.2
 # not in ZTK
 zope.app.session = 3.6.0
-zope.app.testing = 3.7.3
+zope.app.testing = 3.7.5
 zope.app.wsgi = 3.6.0
 # not in ZTK
 zope.app.zapi = 3.4.1
@@ -165,7 +165,7 @@
 zope.browserpage = 3.9.0
 zope.browserresource = 3.9.0
 zope.cachedescriptors = 3.5.0
-zope.component = 3.7.1
+zope.component = 3.9.3
 zope.componentvocabulary = 1.0
 zope.configuration = 3.6.0
 zope.container = 3.9.0
@@ -205,7 +205,7 @@
 zope.schema = 3.5.4
 zope.security = 3.7.1
 zope.securitypolicy = 3.6.1
-zope.sendmail = 3.6.0
+zope.sendmail = 3.7.1
 zope.server = 3.6.1
 zope.session = 3.9.1
 zope.site = 3.7.0
@@ -214,7 +214,7 @@
 zope.tal = 3.5.1
 zope.tales = 3.4.0
 zope.testbrowser = 3.7.0a1
-zope.testing = 3.8.1
+zope.testing = 3.9.4
 zope.thread = 3.4
 zope.traversing = 3.8.0
 zope.viewlet = 3.6.1