From f567ca3e1ae851ea6e7418da3df47e034841a08d Mon Sep 17 00:00:00 2001 From: Collin Winter Date: Mon, 12 Mar 2007 15:57:19 +0000 Subject: [PATCH] Patch #1678088: convert test_operations to use unittest, fold the result into test_dict. --- Lib/test/output/test_operations | 21 --------- Lib/test/regrtest.py | 2 +- Lib/test/test_dict.py | 71 ++++++++++++++++++++++++++++++ Lib/test/test_operations.py | 78 --------------------------------- 4 files changed, 72 insertions(+), 100 deletions(-) delete mode 100644 Lib/test/output/test_operations delete mode 100644 Lib/test/test_operations.py diff --git a/Lib/test/output/test_operations b/Lib/test/output/test_operations deleted file mode 100644 index 8a1bc2a229c..00000000000 --- a/Lib/test/output/test_operations +++ /dev/null @@ -1,21 +0,0 @@ -test_operations -3. Operations -XXX Mostly not yet implemented -3.1 Dictionary lookups fail if __cmp__() raises an exception -raising error -d[x2] = 2: caught the RuntimeError outside -raising error -z = d[x2]: caught the RuntimeError outside -raising error -x2 in d: caught the RuntimeError outside -raising error -d.has_key(x2): caught the RuntimeError outside -raising error -d.get(x2): caught the RuntimeError outside -raising error -d.setdefault(x2, 42): caught the RuntimeError outside -raising error -d.pop(x2): caught the RuntimeError outside -raising error -d.update({x2: 2}): caught the RuntimeError outside -resize bugs not triggered. diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py index f424f7b22b7..ce5f2f608eb 100755 --- a/Lib/test/regrtest.py +++ b/Lib/test/regrtest.py @@ -470,7 +470,7 @@ def main(tests=None, testdir=None, verbose=0, quiet=False, generate=False, STDTESTS = [ 'test_grammar', 'test_opcodes', - 'test_operations', + 'test_dict', 'test_builtin', 'test_exceptions', 'test_types', diff --git a/Lib/test/test_dict.py b/Lib/test/test_dict.py index e99c46d9655..e15ac0b288d 100644 --- a/Lib/test/test_dict.py +++ b/Lib/test/test_dict.py @@ -461,6 +461,77 @@ class DictTest(unittest.TestCase): self.assertEqual(e.args, ((1,),)) else: self.fail("missing KeyError") + + def test_bad_key(self): + # Dictionary lookups should fail if __cmp__() raises an exception. + class CustomException(Exception): + pass + + class BadDictKey: + def __hash__(self): + return hash(self.__class__) + + def __cmp__(self, other): + if isinstance(other, self.__class__): + raise CustomException + return other + + d = {} + x1 = BadDictKey() + x2 = BadDictKey() + d[x1] = 1 + for stmt in ['d[x2] = 2', + 'z = d[x2]', + 'x2 in d', + 'd.has_key(x2)', + 'd.get(x2)', + 'd.setdefault(x2, 42)', + 'd.pop(x2)', + 'd.update({x2: 2})']: + try: + exec stmt in locals() + except CustomException: + pass + else: + self.fail("Statement didn't raise exception") + + def test_resize1(self): + # Dict resizing bug, found by Jack Jansen in 2.2 CVS development. + # This version got an assert failure in debug build, infinite loop in + # release build. Unfortunately, provoking this kind of stuff requires + # a mix of inserts and deletes hitting exactly the right hash codes in + # exactly the right order, and I can't think of a randomized approach + # that would be *likely* to hit a failing case in reasonable time. + + d = {} + for i in range(5): + d[i] = i + for i in range(5): + del d[i] + for i in range(5, 9): # i==8 was the problem + d[i] = i + + def test_resize2(self): + # Another dict resizing bug (SF bug #1456209). + # This caused Segmentation faults or Illegal instructions. + + class X(object): + def __hash__(self): + return 5 + def __eq__(self, other): + if resizing: + d.clear() + return False + d = {} + resizing = False + d[X()] = 1 + d[X()] = 2 + d[X()] = 3 + d[X()] = 4 + d[X()] = 5 + # now trigger a resize + resizing = True + d[9] = 6 from test import mapping_tests diff --git a/Lib/test/test_operations.py b/Lib/test/test_operations.py deleted file mode 100644 index fafc0622119..00000000000 --- a/Lib/test/test_operations.py +++ /dev/null @@ -1,78 +0,0 @@ -# Python test set -- part 3, built-in operations. - - -print '3. Operations' -print 'XXX Mostly not yet implemented' - - -print '3.1 Dictionary lookups fail if __cmp__() raises an exception' - -class BadDictKey: - - def __hash__(self): - return hash(self.__class__) - - def __cmp__(self, other): - if isinstance(other, self.__class__): - print "raising error" - raise RuntimeError, "gotcha" - return other - -d = {} -x1 = BadDictKey() -x2 = BadDictKey() -d[x1] = 1 -for stmt in ['d[x2] = 2', - 'z = d[x2]', - 'x2 in d', - 'd.has_key(x2)', - 'd.get(x2)', - 'd.setdefault(x2, 42)', - 'd.pop(x2)', - 'd.update({x2: 2})']: - try: - exec stmt - except RuntimeError: - print "%s: caught the RuntimeError outside" % (stmt,) - else: - print "%s: No exception passed through!" # old CPython behavior - - -# Dict resizing bug, found by Jack Jansen in 2.2 CVS development. -# This version got an assert failure in debug build, infinite loop in -# release build. Unfortunately, provoking this kind of stuff requires -# a mix of inserts and deletes hitting exactly the right hash codes in -# exactly the right order, and I can't think of a randomized approach -# that would be *likely* to hit a failing case in reasonable time. - -d = {} -for i in range(5): - d[i] = i -for i in range(5): - del d[i] -for i in range(5, 9): # i==8 was the problem - d[i] = i - - -# Another dict resizing bug (SF bug #1456209). -# This caused Segmentation faults or Illegal instructions. - -class X(object): - def __hash__(self): - return 5 - def __eq__(self, other): - if resizing: - d.clear() - return False -d = {} -resizing = False -d[X()] = 1 -d[X()] = 2 -d[X()] = 3 -d[X()] = 4 -d[X()] = 5 -# now trigger a resize -resizing = True -d[9] = 6 - -print 'resize bugs not triggered.'