When using -R, lots of "*** DocTestRunner.merge:" nuisance messages

tim.peters · tim.peters · commit ea0334ceb25d · 2006-04-13T23:12:24.000Z
appear. Get rid of them by nuking doctest's default DocTestRunner instance as part of cleanup(). Also cleanup() before running the first test repetition (the test was run once before we get into the -R branch). git-svn-id: http://svn.python.org/projects/python/trunk@45371 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
@@ -520,7 +520,7 @@ def runtest(test, generate, verbose, quiet, testdir=None, huntrleaks=False):
                 import gc
                 def cleanup():
                     import _strptime, linecache, warnings, dircache
-                    import urlparse, urllib, urllib2, mimetypes
+                    import urlparse, urllib, urllib2, mimetypes, doctest
                     from distutils.dir_util import _path_created
                     _path_created.clear()
                     warnings.filters[:] = fs
@@ -537,6 +537,7 @@ def cleanup():
                     dircache.reset()
                     linecache.clearcache()
                     mimetypes._default_mime_types()
+                    doctest.master = None
                 if indirect_test:
                     def run_the_test():
                         indirect_test()
@@ -548,6 +549,7 @@ def run_the_test():
                 print >> sys.stderr, "beginning", repcount, "repetitions"
                 print >> sys.stderr, \
                       ("1234567890"*(repcount//10 + 1))[:repcount]
+                cleanup()
                 for i in range(repcount):
                     rc = sys.gettotalrefcount()
                     run_the_test()
