[Python-checkins] CVS: python/dist/src/Lib/test test_dumbdbm.py,1.5,1.6

[Skip Montanaro]

Update of /cvsroot/python/python/dist/src/Lib/test
In directory usw-pr-cvs1:/tmp/cvs-serv8634

Modified Files:
	test_dumbdbm.py 
Log Message:
restructure a bit to not rely on test case execution ordering
add test case for bug #482460


Index: test_dumbdbm.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_dumbdbm.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** test_dumbdbm.py	30 Jan 2002 07:32:53 -0000	1.5
--- test_dumbdbm.py	17 Mar 2002 23:03:42 -0000	1.6
***************
*** 31,39 ****
      def __init__(self, *args):
          unittest.TestCase.__init__(self, *args)
-         self._dkeys = self._dict.keys()
-         self._dkeys.sort()
  
      def test_dumbdbm_creation(self):
-         _delete_files()
          f = dumbdbm.open(_fname, 'c')
          self.assertEqual(f.keys(), [])
--- 31,36 ----
***************
*** 44,47 ****
--- 41,45 ----
  
      def test_dumbdbm_modification(self):
+         self.init_db()
          f = dumbdbm.open(_fname, 'w')
          self._dict['g'] = f['g'] = "indented"
***************
*** 50,53 ****
--- 48,52 ----
  
      def test_dumbdbm_read(self):
+         self.init_db()
          f = dumbdbm.open(_fname, 'r')
          self.read_helper(f)
***************
*** 55,62 ****
--- 54,72 ----
  
      def test_dumbdbm_keys(self):
+         self.init_db()
          f = dumbdbm.open(_fname)
          keys = self.keys_helper(f)
          f.close()
  
+     def test_write_write_read(self):
+         # test for bug #482460
+         f = dumbdbm.open(_fname)
+         f['1'] = 'hello'
+         f['1'] = 'hello2'
+         f.close()
+         f = dumbdbm.open(_fname)
+         self.assertEqual(f['1'], 'hello2')
+         f.close()
+ 
      def read_helper(self, f):
          keys = self.keys_helper(f)
***************
*** 64,72 ****
              self.assertEqual(self._dict[key], f[key])
  
      def keys_helper(self, f):
          keys = f.keys()
          keys.sort()
!         self.assertEqual(keys, self._dkeys)
          return keys
  
  def test_main():
--- 74,96 ----
              self.assertEqual(self._dict[key], f[key])
  
+     def init_db(self):
+         f = dumbdbm.open(_fname, 'w')
+         for k in self._dict:
+             f[k] = self._dict[k]
+         f.close()
+ 
      def keys_helper(self, f):
          keys = f.keys()
          keys.sort()
!         dkeys = self._dict.keys()
!         dkeys.sort()
!         self.assertEqual(keys, dkeys)
          return keys
+ 
+     def tearDown(self):
+         _delete_files()
+ 
+     def setUp(self):
+         _delete_files()
  
  def test_main():