From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Mon, 18 Mar 2013 17:09:50 +0000 (-0700)
Subject: Issue #17463: Fix test discovery for test_pdb.py
X-Git-Tag: v3.3.1rc1~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f0efea0841a825b8aa68e2ff97ff24ae31037f80;p=thirdparty%2FPython%2Fcpython.git

Issue #17463: Fix test discovery for test_pdb.py
---

diff --git a/Lib/test/test_pdb.py b/Lib/test/test_pdb.py
index 4fb07a3cc0fa..03084e4d122e 100644
--- a/Lib/test/test_pdb.py
+++ b/Lib/test/test_pdb.py
@@ -1,5 +1,6 @@
 # A test suite for pdb; not very comprehensive at the moment.
 
+import doctest
 import imp
 import pdb
 import sys
@@ -701,11 +702,11 @@ class PdbTestCase(unittest.TestCase):
         support.unlink(support.TESTFN)
 
 
-def test_main():
+def load_tests(*args):
     from test import test_pdb
-    support.run_doctest(test_pdb, verbosity=True)
-    support.run_unittest(PdbTestCase)
+    suites = [unittest.makeSuite(PdbTestCase), doctest.DocTestSuite(test_pdb)]
+    return unittest.TestSuite(suites)
 
 
 if __name__ == '__main__':
-    test_main()
+    unittest.main()