Changeset 391 for python/trunk/Lib/test/test_gdbm.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_gdbm.py (modified) (5 diffs)

python/trunk/Lib/test/test_gdbm.py

@@ -1 @@
-import gdbm
 import unittest
 import os
-from test.test_support import verbose, TESTFN, run_unittest, unlink
+from test.test_support import TESTFN, run_unittest, unlink, import_module
+gdbm = import_module('gdbm')
 
 
@@ -24 +24 @@
         key_set = set(self.g.keys())
         self.assertEqual(key_set, frozenset(['a', '12345678910']))
-        self.assert_(self.g.has_key('a'))
+        self.assertTrue(self.g.has_key('a'))
         key = self.g.firstkey()
         while key:
-            self.assert_(key in key_set)
+            self.assertIn(key, key_set)
             key_set.remove(key)
             key = self.g.nextkey(key)
@@ -48 +48 @@
         # Test standard flags (presumably "crwn").
         modes = all - set('fsu')
-        for mode in modes:
+        for mode in sorted(modes):
             self.g = gdbm.open(filename, mode)
             self.g.close()
@@ -65 +65 @@
         self.g['x'] = 'x' * 10000
         size1 = os.path.getsize(filename)
-        self.assert_(size0 < size1)
+        self.assertTrue(size0 < size1)
 
         del self.g['x']
@@ -73 +73 @@
         self.g.reorganize()
         size2 = os.path.getsize(filename)
-        self.assert_(size1 > size2 >= size0)
+        self.assertTrue(size1 > size2 >= size0)