Merge ~cjwatson/launchpad:remove-zope.testing.renormalizing into launchpad:master

Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: c92997427c73669a2b18094a23c99235db492d4b
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:remove-zope.testing.renormalizing
Merge into: launchpad:master
Diff against target: 138 lines (+5/-21)
6 files modified
lib/lp/app/validators/tests/test_validators.py (+1/-3)
lib/lp/app/widgets/tests/test_widget_doctests.py (+1/-4)
lib/lp/registry/tests/test_doc_project.py (+1/-3)
lib/lp/services/tests/test_helpers.py (+1/-3)
lib/lp/testing/systemdocs.py (+0/-5)
lib/lp/translations/utilities/tests/test_gettext_po_parser.py (+1/-3)
Reviewer Review Type Date Requested Status
Cristian Gonzalez (community) Approve
Review via email: mp+407201@code.launchpad.net

Commit message

Remove most uses of zope.testing.renormalizing

Description of the change

We were mainly using this module for the `IGNORE_EXCEPTION_MODULE_IN_PYTHON2` option flag, but we no longer need that. `lp.services.mail.tests.test_stub` still has a legitimate use for this module, since it does regex substitution on the output of one example.

To post a comment you must log in.
Revision history for this message
Cristian Gonzalez (cristiangsp) wrote :

Looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/lp/app/validators/tests/test_validators.py b/lib/lp/app/validators/tests/test_validators.py
2index b83c481..af97c8a 100644
3--- a/lib/lp/app/validators/tests/test_validators.py
4+++ b/lib/lp/app/validators/tests/test_validators.py
5@@ -12,8 +12,6 @@ from doctest import (
6 )
7 from unittest import TestSuite
8
9-from zope.testing.renormalizing import OutputChecker
10-
11 from lp.testing.layers import LaunchpadFunctionalLayer
12 from lp.testing.systemdocs import (
13 setUp,
14@@ -51,7 +49,7 @@ def suitefor(module):
15 """Make a doctest suite with common setUp and tearDown functions."""
16 suite = DocTestSuite(
17 module, setUp=setUp, tearDown=tearDown,
18- optionflags=ELLIPSIS | NORMALIZE_WHITESPACE, checker=OutputChecker())
19+ optionflags=ELLIPSIS | NORMALIZE_WHITESPACE)
20 # We have to invoke the LaunchpadFunctionalLayer in order to
21 # initialize the ZCA machinery, which is a pre-requisite for using
22 # login().
23diff --git a/lib/lp/app/widgets/tests/test_widget_doctests.py b/lib/lp/app/widgets/tests/test_widget_doctests.py
24index d301a14..cbad1dc 100644
25--- a/lib/lp/app/widgets/tests/test_widget_doctests.py
26+++ b/lib/lp/app/widgets/tests/test_widget_doctests.py
27@@ -6,8 +6,6 @@ __metaclass__ = type
28 import doctest
29 import unittest
30
31-from zope.testing.renormalizing import OutputChecker
32-
33 from lp.testing.layers import DatabaseFunctionalLayer
34
35
36@@ -15,6 +13,5 @@ def test_suite():
37 suite = unittest.TestSuite()
38 suite.layer = DatabaseFunctionalLayer
39 suite.addTest(doctest.DocTestSuite('lp.app.widgets.textwidgets'))
40- suite.addTest(doctest.DocTestSuite(
41- 'lp.app.widgets.date', checker=OutputChecker()))
42+ suite.addTest(doctest.DocTestSuite('lp.app.widgets.date'))
43 return suite
44diff --git a/lib/lp/registry/tests/test_doc_project.py b/lib/lp/registry/tests/test_doc_project.py
45index 0e9aaa0..dd4b773 100644
46--- a/lib/lp/registry/tests/test_doc_project.py
47+++ b/lib/lp/registry/tests/test_doc_project.py
48@@ -6,7 +6,6 @@ __metaclass__ = type
49 from doctest import DocTestSuite
50
51 from zope.component import getUtility
52-from zope.testing.renormalizing import OutputChecker
53
54 from lp.testing import (
55 ANONYMOUS,
56@@ -21,7 +20,6 @@ def setUp(test):
57
58
59 def test_suite():
60- suite = DocTestSuite(
61- 'lp.registry.model.projectgroup', setUp=setUp, checker=OutputChecker())
62+ suite = DocTestSuite('lp.registry.model.projectgroup', setUp=setUp)
63 suite.layer = LaunchpadFunctionalLayer
64 return suite
65diff --git a/lib/lp/services/tests/test_helpers.py b/lib/lp/services/tests/test_helpers.py
66index 4a1aa84..ff3d68e 100644
67--- a/lib/lp/services/tests/test_helpers.py
68+++ b/lib/lp/services/tests/test_helpers.py
69@@ -5,8 +5,6 @@ from doctest import DocTestSuite
70 from textwrap import dedent
71 import unittest
72
73-from zope.testing.renormalizing import OutputChecker
74-
75 from lp.services import helpers
76 from lp.services.tarfile_helpers import LaunchpadWriteTarFile
77
78@@ -192,7 +190,7 @@ class TruncateTextTest(unittest.TestCase):
79 def test_suite():
80 suite = unittest.TestSuite()
81 suite.addTest(DocTestSuite())
82- suite.addTest(DocTestSuite(helpers, checker=OutputChecker()))
83+ suite.addTest(DocTestSuite(helpers))
84 suite.addTest(
85 unittest.TestLoader().loadTestsFromTestCase(TruncateTextTest))
86 return suite
87diff --git a/lib/lp/testing/systemdocs.py b/lib/lp/testing/systemdocs.py
88index 43abf79..f7d30b5 100644
89--- a/lib/lp/testing/systemdocs.py
90+++ b/lib/lp/testing/systemdocs.py
91@@ -27,7 +27,6 @@ import six
92 import transaction
93 from zope.component import getUtility
94 from zope.testing.loggingsupport import Handler
95-from zope.testing.renormalizing import OutputChecker
96
97 from lp.services.config import config
98 from lp.services.database.sqlbase import flush_database_updates
99@@ -81,9 +80,6 @@ class FilePrefixStrippingDocTestParser(doctest.DocTestParser):
100 default_parser = FilePrefixStrippingDocTestParser()
101
102
103-default_checker = OutputChecker()
104-
105-
106 class StdoutHandler(Handler):
107 """A logging handler that prints log messages to sys.stdout.
108
109@@ -150,7 +146,6 @@ def LayeredDocFileSuite(paths, id_extensions=None, **kw):
110 id_extensions = []
111 kw.setdefault('optionflags', default_optionflags)
112 kw.setdefault('parser', default_parser)
113- kw.setdefault('checker', default_checker)
114
115 # Make sure that paths are resolved relative to our caller
116 kw['package'] = doctest._normalize_module(kw.get('package'))
117diff --git a/lib/lp/translations/utilities/tests/test_gettext_po_parser.py b/lib/lp/translations/utilities/tests/test_gettext_po_parser.py
118index ad3619e..dc52b7a 100644
119--- a/lib/lp/translations/utilities/tests/test_gettext_po_parser.py
120+++ b/lib/lp/translations/utilities/tests/test_gettext_po_parser.py
121@@ -5,8 +5,6 @@ import doctest
122 import re
123 import unittest
124
125-from zope.testing.renormalizing import OutputChecker
126-
127 from lp.translations.interfaces.translationimporter import (
128 TranslationFormatInvalidInputError,
129 TranslationFormatSyntaxError,
130@@ -454,7 +452,7 @@ class POBasicTestCase(unittest.TestCase):
131
132 def test_suite():
133 # Run gettext PO parser doc tests.
134- dt_suite = doctest.DocTestSuite(gettext_po_parser, checker=OutputChecker())
135+ dt_suite = doctest.DocTestSuite(gettext_po_parser)
136 loader = unittest.TestLoader()
137 ut_suite = loader.loadTestsFromTestCase(POBasicTestCase)
138 return unittest.TestSuite((ut_suite, dt_suite))

Subscribers

People subscribed via source and target branches

to status/vote changes: