Bug #1529297: The rewrite of doctest for Python 2.4 unintentionally

lost that tests are sorted by name before being run.  ``DocTestFinder``
has been changed to sort the list of tests it returns.
This commit is contained in:
Tim Peters 2006-07-27 23:44:37 +00:00
parent 00decd7835
commit 6f6814706e
3 changed files with 11 additions and 7 deletions

View File

@ -821,6 +821,11 @@ class DocTestFinder:
# Recursively expore `obj`, extracting DocTests. # Recursively expore `obj`, extracting DocTests.
tests = [] tests = []
self._find(tests, obj, name, module, source_lines, globs, {}) self._find(tests, obj, name, module, source_lines, globs, {})
# Sort the tests by alpha order of names, for consistency in
# verbose-mode output. This was a feature of doctest in Pythons
# <= 2.3 that got lost by accident in 2.4. It was repaired in
# 2.4.4 and 2.5.
tests.sort()
return tests return tests
def _from_module(self, module, object): def _from_module(self, module, object):

View File

@ -419,7 +419,6 @@ methods, classmethods, staticmethods, properties, and nested classes.
>>> finder = doctest.DocTestFinder() >>> finder = doctest.DocTestFinder()
>>> tests = finder.find(SampleClass) >>> tests = finder.find(SampleClass)
>>> tests.sort()
>>> for t in tests: >>> for t in tests:
... print '%2s %s' % (len(t.examples), t.name) ... print '%2s %s' % (len(t.examples), t.name)
3 SampleClass 3 SampleClass
@ -435,7 +434,6 @@ methods, classmethods, staticmethods, properties, and nested classes.
New-style classes are also supported: New-style classes are also supported:
>>> tests = finder.find(SampleNewStyleClass) >>> tests = finder.find(SampleNewStyleClass)
>>> tests.sort()
>>> for t in tests: >>> for t in tests:
... print '%2s %s' % (len(t.examples), t.name) ... print '%2s %s' % (len(t.examples), t.name)
1 SampleNewStyleClass 1 SampleNewStyleClass
@ -475,7 +473,6 @@ functions, classes, and the `__test__` dictionary, if it exists:
>>> # ignoring the objects since they weren't defined in m. >>> # ignoring the objects since they weren't defined in m.
>>> import test.test_doctest >>> import test.test_doctest
>>> tests = finder.find(m, module=test.test_doctest) >>> tests = finder.find(m, module=test.test_doctest)
>>> tests.sort()
>>> for t in tests: >>> for t in tests:
... print '%2s %s' % (len(t.examples), t.name) ... print '%2s %s' % (len(t.examples), t.name)
1 some_module 1 some_module
@ -499,7 +496,6 @@ will only be generated for it once:
>>> from test import doctest_aliases >>> from test import doctest_aliases
>>> tests = excl_empty_finder.find(doctest_aliases) >>> tests = excl_empty_finder.find(doctest_aliases)
>>> tests.sort()
>>> print len(tests) >>> print len(tests)
2 2
>>> print tests[0].name >>> print tests[0].name
@ -517,7 +513,6 @@ Empty Tests
By default, an object with no doctests doesn't create any tests: By default, an object with no doctests doesn't create any tests:
>>> tests = doctest.DocTestFinder().find(SampleClass) >>> tests = doctest.DocTestFinder().find(SampleClass)
>>> tests.sort()
>>> for t in tests: >>> for t in tests:
... print '%2s %s' % (len(t.examples), t.name) ... print '%2s %s' % (len(t.examples), t.name)
3 SampleClass 3 SampleClass
@ -536,7 +531,6 @@ is really to support backward compatibility in what doctest.master.summarize()
displays. displays.
>>> tests = doctest.DocTestFinder(exclude_empty=False).find(SampleClass) >>> tests = doctest.DocTestFinder(exclude_empty=False).find(SampleClass)
>>> tests.sort()
>>> for t in tests: >>> for t in tests:
... print '%2s %s' % (len(t.examples), t.name) ... print '%2s %s' % (len(t.examples), t.name)
3 SampleClass 3 SampleClass
@ -557,7 +551,6 @@ DocTestFinder can be told not to look for tests in contained objects
using the `recurse` flag: using the `recurse` flag:
>>> tests = doctest.DocTestFinder(recurse=False).find(SampleClass) >>> tests = doctest.DocTestFinder(recurse=False).find(SampleClass)
>>> tests.sort()
>>> for t in tests: >>> for t in tests:
... print '%2s %s' % (len(t.examples), t.name) ... print '%2s %s' % (len(t.examples), t.name)
3 SampleClass 3 SampleClass

View File

@ -47,6 +47,12 @@ Core and builtins
Library Library
------- -------
- Bug #1529297: The rewrite of doctest for Python 2.4 unintentionally
lost that tests are sorted by name before being run. This rarely
matters for well-written tests, but can create baffling symptoms if
side effects from one test to the next affect outcomes. ``DocTestFinder``
has been changed to sort the list of tests it returns.
- The distutils version has been changed to 2.5.0. - The distutils version has been changed to 2.5.0.
- Bug #978833: Really close underlying socket in _socketobject.close. - Bug #978833: Really close underlying socket in _socketobject.close.