Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Fix errors in bsddb3 tests due to removal of exception slicing. 

(There was also a segfault but it disappeared when the tests
stopped erroring out; I presume the segfault is a pre-existing
problem somewhere in a destructor.)
This commit is contained in:
Guido van Rossum 2007-03-28 21:02:43 +00:00
parent cef2098cfa
commit 782ff275b8
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Lib/bsddb/test/test_basics.py
View File

@ -163,7 +163,7 @@ class BasicTestCase(unittest.TestCase):
try:
d.delete('abcd')
except db.DBNotFoundError as val:
assert val[0] == db.DB_NOTFOUND
assert val.args[0] == db.DB_NOTFOUND
if verbose: print(val)
else:
self.fail("expected exception")
@ -182,7 +182,7 @@ class BasicTestCase(unittest.TestCase):
try:
d.put('abcd', 'this should fail', flags=db.DB_NOOVERWRITE)
except db.DBKeyExistError as val:
assert val[0] == db.DB_KEYEXIST
assert val.args[0] == db.DB_KEYEXIST
if verbose: print(val)
else:
self.fail("expected exception")
@ -315,7 +315,7 @@ class BasicTestCase(unittest.TestCase):
rec = c.next()
except db.DBNotFoundError as val:
if get_raises_error:
assert val[0] == db.DB_NOTFOUND
assert val.args[0] == db.DB_NOTFOUND
if verbose: print(val)
rec = None
else:
@ -335,7 +335,7 @@ class BasicTestCase(unittest.TestCase):
rec = c.prev()
except db.DBNotFoundError as val:
if get_raises_error:
assert val[0] == db.DB_NOTFOUND
assert val.args[0] == db.DB_NOTFOUND
if verbose: print(val)
rec = None
else:
@ -358,7 +358,7 @@ class BasicTestCase(unittest.TestCase):
try:
n = c.set('bad key')
except db.DBNotFoundError as val:
assert val[0] == db.DB_NOTFOUND
assert val.args[0] == db.DB_NOTFOUND
if verbose: print(val)
else:
if set_raises_error:
@ -372,7 +372,7 @@ class BasicTestCase(unittest.TestCase):
try:
n = c.get_both('0404', 'bad data')
except db.DBNotFoundError as val:
assert val[0] == db.DB_NOTFOUND
assert val.args[0] == db.DB_NOTFOUND
if verbose: print(val)
else:
if get_raises_error:
@ -401,7 +401,7 @@ class BasicTestCase(unittest.TestCase):
rec = c.current()
except db.DBKeyEmptyError as val:
if get_raises_error:
assert val[0] == db.DB_KEYEMPTY
assert val.args[0] == db.DB_KEYEMPTY
if verbose: print(val)
else:
self.fail("unexpected DBKeyEmptyError")
@ -446,7 +446,7 @@ class BasicTestCase(unittest.TestCase):
# a bug may cause a NULL pointer dereference...
getattr(c, method)(*args)
except db.DBError as val:
assert val[0] == 0
assert val.args[0] == 0
if verbose: print(val)
else:
self.fail("no exception raised when using a buggy cursor's"

6
Lib/bsddb/test/test_recno.py
View File

@ -64,7 +64,7 @@ class SimpleRecnoTestCase(unittest.TestCase):
try:
data = d[0] # This should raise a KeyError!?!?!
except db.DBInvalidArgError as val:
assert val[0] == db.EINVAL
assert val.args[0] == db.EINVAL
if verbose: print(val)
else:
self.fail("expected exception")
@ -181,7 +181,7 @@ class SimpleRecnoTestCase(unittest.TestCase):
if get_returns_none:
self.fail("unexpected DBKeyEmptyError exception")
else:
assert val[0] == db.DB_KEYEMPTY
assert val.args[0] == db.DB_KEYEMPTY
if verbose: print(val)
else:
if not get_returns_none:
@ -268,7 +268,7 @@ class SimpleRecnoTestCase(unittest.TestCase):
try: # this one will fail
d.append('bad' * 20)
except db.DBInvalidArgError as val:
assert val[0] == db.EINVAL
assert val.args[0] == db.EINVAL
if verbose: print(val)
else:
self.fail("expected exception")