Commit e945b7ad authored by Guido van Rossum's avatar Guido van Rossum

Fix the last two tests.

Thanks to Brett for fixing so many before!
I see some tracebacks from threads when testing test_bsddbd3 (on OSX)
but the test claims to pass, so I'm ignoring these.
parent a0983d32
test_bsddb test_compile
......@@ -198,9 +198,9 @@ class TestBSDDB(unittest.TestCase):
# do the bsddb._DBWithCursor _iter_mixin internals leak cursors?
nc1 = len(self.f._cursor_refs)
# create iterator
i = iter(self.f.items())
i = iter(self.f.iteritems())
nc2 = len(self.f._cursor_refs)
# use the iterator (should run to the first yeild, creating the cursor)
# use the iterator (should run to the first yield, creating the cursor)
k, v = i.next()
nc3 = len(self.f._cursor_refs)
# destroy the iterator; this should cause the weakref callback
......@@ -210,7 +210,7 @@ class TestBSDDB(unittest.TestCase):
self.assertEqual(nc1, nc2)
self.assertEqual(nc1, nc4)
self.assert_(nc3 == nc1+1)
self.assertEqual(nc3, nc1+1)
def test_popitem(self):
k, v = self.f.popitem()
......
......@@ -53,8 +53,8 @@ class TestSpecifics(unittest.TestCase):
raise KeyError
def __setitem__(self, key, value):
self.results = (key, value)
def __iter__(self):
return iter('xyz')
def keys(self):
return list('xyz')
m = M()
g = globals()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment