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.

diff --git a/BROKEN b/BROKEN
deleted file mode 100644 (file)
index 60e1051..0000000
--- a/BROKEN
+++ /dev/null
@@ -1 +0,0 @@
-    test_bsddb test_compile

diff --git a/Lib/test/test_bsddb.py b/Lib/test/test_bsddb.py
index 0fb8e877d3bbf4e2c318e0daa64742e067701834..3a62f9c1c7f6314f25897ee73b8f06842eaf7a0e 100755 (executable)
--- a/Lib/test/test_bsddb.py
+++ b/Lib/test/test_bsddb.py
@@ -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()

diff --git a/Lib/test/test_compile.py b/Lib/test/test_compile.py
index 2b5a135ab273d9b317d5ecf657b3ee8a8dc9a472..1acb4a1f5d9ac053bf1a66628507c54a98a949fd 100644 (file)
--- a/Lib/test/test_compile.py
+++ b/Lib/test/test_compile.py
@@ -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()