Closes #22104: Merge with 3.4

This commit is contained in:
Zachary Ware 2014-08-04 11:18:23 -05:00
commit 17c336284d
2 changed files with 7 additions and 2 deletions

View File

@ -1273,8 +1273,10 @@ def runtest_inner(test, verbose, quiet,
# tests. If not, use normal unittest test loading.
test_runner = getattr(the_module, "test_main", None)
if test_runner is None:
tests = unittest.TestLoader().loadTestsFromModule(the_module)
test_runner = lambda: support.run_unittest(tests)
def test_runner():
loader = unittest.TestLoader()
tests = loader.loadTestsFromModule(the_module)
support.run_unittest(tests)
test_runner()
if huntrleaks:
refleak = dash_R(the_module, test, test_runner, huntrleaks)

View File

@ -802,6 +802,9 @@ Documentation
Tests
-----
- Issue #22104: regrtest.py no longer holds a reference to the suite of tests
loaded from test modules that don't define test_main().
- Issue #22111: Assorted cleanups in test_imaplib. Patch by Milan Oberkirch.
- Issue #22002: Added ``load_package_tests`` function to test.support and used