Changeset 391 for python/trunk/Lib/test/test_bsddb.py

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Lib/test/test_bsddb.py (modified) (8 diffs)

python/trunk/Lib/test/test_bsddb.py

@@ -4 +4 @@
 """
 import os, sys
-import copy
-import bsddb
-import dbhash # Just so we know it's imported
 import unittest
 from test import test_support
+
+# Skip test if _bsddb wasn't built.
+test_support.import_module('_bsddb')
+
+bsddb = test_support.import_module('bsddb', deprecated=True)
+# Just so we know it's imported:
+test_support.import_module('dbhash', deprecated=True)
+
 
 class TestBSDDB(unittest.TestCase):
@@ -39 +44 @@
         self.f['r'] = 'discovered'
         self.assertEqual(self.f['r'], 'discovered')
-        self.assert_('r' in self.f.keys())
-        self.assert_('discovered' in self.f.values())
+        self.assertIn('r', self.f.keys())
+        self.assertIn('discovered', self.f.values())
 
     def test_close_and_reopen(self):
@@ -172 +177 @@
     def test_first_while_deleting(self):
         # Test for bug 1725856
-        self.assert_(len(self.d) >= 2, "test requires >=2 items")
+        self.assertTrue(len(self.d) >= 2, "test requires >=2 items")
         for _ in self.d:
             key = self.f.first()[0]
@@ -180 +185 @@
     def test_last_while_deleting(self):
         # Test for bug 1725856's evil twin
-        self.assert_(len(self.d) >= 2, "test requires >=2 items")
+        self.assertTrue(len(self.d) >= 2, "test requires >=2 items")
         for _ in self.d:
             key = self.f.last()[0]
@@ -191 +196 @@
     def test_contains(self):
         for k in self.d:
-            self.assert_(k in self.f)
-        self.assert_('not here' not in self.f)
+            self.assertIn(k, self.f)
+        self.assertNotIn('not here', self.f)
 
     def test_has_key(self):
         for k in self.d:
-            self.assert_(self.f.has_key(k))
-        self.assert_(not self.f.has_key('not here'))
+            self.assertTrue(self.f.has_key(k))
+        self.assertTrue(not self.f.has_key('not here'))
 
     def test_clear(self):
@@ -249 +254 @@
 
         # test the legacy cursor interface mixed with writes
-        self.assert_(self.f.first()[0] in self.d)
+        self.assertIn(self.f.first()[0], self.d)
         k = self.f.next()[0]
-        self.assert_(k in self.d)
+        self.assertIn(k, self.d)
         self.f[k] = "be gone with ye deadlocks"
-        self.assert_(self.f[k], "be gone with ye deadlocks")
+        self.assertTrue(self.f[k], "be gone with ye deadlocks")
 
     def test_for_cursor_memleak(self):
@@ -271 +276 @@
         self.assertEqual(nc1, nc2)
         self.assertEqual(nc1, nc4)
-        self.assert_(nc3 == nc1+1)
+        self.assertTrue(nc3 == nc1+1)
 
     def test_popitem(self):
         k, v = self.f.popitem()
-        self.assert_(k in self.d)
-        self.assert_(v in self.d.values())
-        self.assert_(k not in self.f)
+        self.assertIn(k, self.d)
+        self.assertIn(v, self.d.values())
+        self.assertNotIn(k, self.f)
         self.assertEqual(len(self.d)-1, len(self.f))
 
@@ -284 +289 @@
         v = self.f.pop(k)
         self.assertEqual(v, self.d[k])
-        self.assert_(k not in self.f)
-        self.assert_(v not in self.f.values())
+        self.assertNotIn(k, self.f)
+        self.assertNotIn(v, self.f.values())
         self.assertEqual(len(self.d)-1, len(self.f))