From f9756c2336029d082317718cd1b2e330f48164d6 Mon Sep 17 00:00:00 2001 From: Ezio Melotti Date: Mon, 9 May 2011 18:36:53 +0300 Subject: Some more tests were incorrectly marked as C specific. --- Lib/test/test_heapq.py | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/Lib/test/test_heapq.py b/Lib/test/test_heapq.py index 3016c30..9682f6e 100644 --- a/Lib/test/test_heapq.py +++ b/Lib/test/test_heapq.py @@ -191,17 +191,8 @@ class TestHeap(TestCase): self.assertEqual(list(self.module.nlargest(n, data, key=f)), sorted(data, key=f, reverse=True)[:n]) - -class TestHeapPython(TestHeap): - module = py_heapq - - -@skipUnless(c_heapq, 'requires _heapq') -class TestHeapC(TestHeap): - module = c_heapq - def test_comparison_operator(self): - # Issue 3501: Make sure heapq works with both __lt__ + # Issue 3051: Make sure heapq works with both __lt__ # For python 3.0, __le__ alone is not enough def hsort(data, comp): data = [comp(x) for x in data] @@ -223,6 +214,15 @@ class TestHeapC(TestHeap): self.assertRaises(TypeError, data, LE) +class TestHeapPython(TestHeap): + module = py_heapq + + +@skipUnless(c_heapq, 'requires _heapq') +class TestHeapC(TestHeap): + module = c_heapq + + #============================================================================== class LenOnly: @@ -377,8 +377,6 @@ class TestErrorHandling(TestCase): def test_main(verbose=None): - from types import BuiltinFunctionType - test_classes = [TestModules, TestHeapPython, TestHeapC, TestErrorHandling] support.run_unittest(*test_classes) -- cgit v0.12