#16748: test_heapq now works with unittest test discovery.

diff --git a/Lib/test/test_heapq.py b/Lib/test/test_heapq.py
index e0c49c110f6c98112ed936a16f8c66a70c1d0b01..54395c07405765df5439442e5e76011270ebc030 100644 (file)
--- a/Lib/test/test_heapq.py
+++ b/Lib/test/test_heapq.py
@@ -2,6 +2,7 @@
 
 import sys
 import random
+import unittest
 
 from test import support
 from unittest import TestCase, skipUnless
@@ -25,8 +26,7 @@ class TestModules(TestCase):
             self.assertEqual(getattr(c_heapq, fname).__module__, '_heapq')
 
 
-class TestHeap(TestCase):
-    module = None
+class TestHeap:
 
     def test_push_pop(self):
         # 1) Push 256 random numbers and pop them off, verifying all's OK.
@@ -214,12 +214,12 @@ class TestHeap(TestCase):
         self.assertRaises(TypeError, data, LE)
 
 
-class TestHeapPython(TestHeap):
+class TestHeapPython(TestHeap, TestCase):
     module = py_heapq
 
 
 @skipUnless(c_heapq, 'requires _heapq')
-class TestHeapC(TestHeap):
+class TestHeapC(TestHeap, TestCase):
     module = c_heapq
 
 
@@ -319,8 +319,7 @@ def L(seqn):
     return chain(map(lambda x:x, R(Ig(G(seqn)))))
 
 
-class TestErrorHandling(TestCase):
-    module = None
+class TestErrorHandling:
 
     def test_non_sequence(self):
         for f in (self.module.heapify, self.module.heappop):
@@ -371,31 +370,13 @@ class TestErrorHandling(TestCase):
                 self.assertRaises(ZeroDivisionError, f, 2, E(s))
 
 
-class TestErrorHandlingPython(TestErrorHandling):
+class TestErrorHandlingPython(TestErrorHandling, TestCase):
     module = py_heapq
 
 @skipUnless(c_heapq, 'requires _heapq')
-class TestErrorHandlingC(TestErrorHandling):
+class TestErrorHandlingC(TestErrorHandling, TestCase):
     module = c_heapq
 
 
-#==============================================================================
-
-
-def test_main(verbose=None):
-    test_classes = [TestModules, TestHeapPython, TestHeapC,
-                    TestErrorHandlingPython, TestErrorHandlingC]
-    support.run_unittest(*test_classes)
-
-    # verify reference counting
-    if verbose and hasattr(sys, "gettotalrefcount"):
-        import gc
-        counts = [None] * 5
-        for i in range(len(counts)):
-            support.run_unittest(*test_classes)
-            gc.collect()
-            counts[i] = sys.gettotalrefcount()
-        print(counts)
-
 if __name__ == "__main__":
-    test_main(verbose=True)
+    unittest.main()

diff --git a/Misc/NEWS b/Misc/NEWS
index 80e02b431a41785f547a31184dd496f8699860e3..fdc313914e394cf8170833561f327b2ff9d6c727 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -381,6 +381,8 @@ Library
 Tests
 -----
 
+- Issue #16748: test_heapq now works with unittest test discovery.
+
 - Issue #15324: Fix regrtest parsing of --fromfile, --match, and --randomize
   options.