Convert test_compare to use unittest. Hopefully we can find out
why this breaks on openbsd sometimes.
diff --git a/Lib/test/test_compare.py b/Lib/test/test_compare.py
index 6899926..2fde614 100644
--- a/Lib/test/test_compare.py
+++ b/Lib/test/test_compare.py
@@ -1,4 +1,6 @@
import sys
+import unittest
+from test import test_support
class Empty:
def __repr__(self):
@@ -27,28 +29,31 @@
def __cmp__(self, other):
return cmp(self.arg, other)
+class ComparisonTest(unittest.TestCase):
+ set1 = [2, 2.0, 2L, 2+0j, Coerce(2), Cmp(2.0)]
+ set2 = [[1], (3,), None, Empty()]
+ candidates = set1 + set2
-candidates = [2, 2.0, 2L, 2+0j, [1], (3,), None, Empty(), Coerce(2), Cmp(2.0)]
-
-def test():
- for a in candidates:
- for b in candidates:
- try:
- x = a == b
- except:
- print 'cmp(%s, %s) => %s' % (a, b, sys.exc_info()[0])
- else:
- if x:
- print "%s == %s" % (a, b)
+ def test_comparisons(self):
+ for a in self.candidates:
+ for b in self.candidates:
+ if ((a in self.set1) and (b in self.set1)) or a is b:
+ self.assertEqual(a, b)
else:
- print "%s != %s" % (a, b)
- # Ensure default comparison compares id() of args
- L = []
- for i in range(10):
- L.insert(len(L)//2, Empty())
- for a in L:
- for b in L:
- if cmp(a, b) != cmp(id(a), id(b)):
- print "ERROR:", cmp(a, b), cmp(id(a), id(b)), id(a), id(b)
+ self.assertNotEqual(a, b)
-test()
+ def test_id_comparisons(self):
+ # Ensure default comparison compares id() of args
+ L = []
+ for i in range(10):
+ L.insert(len(L)//2, Empty())
+ for a in L:
+ for b in L:
+ self.assertEqual(cmp(a, b), cmp(id(a), id(b)),
+ 'a=%r, b=%r' % (a, b))
+
+def test_main():
+ test_support.run_unittest(ComparisonTest)
+
+if __name__ == '__main__':
+ test_main()