Lib/test/test_gdbm.py
===================================================================
Lib/test/test_gdbm.py	(revision 60379)
Lib/test/test_gdbm.py	(working copy)
@@ -4,43 +4,46 @@
 """
 
 import gdbm
-from gdbm import error
-from test.test_support import verbose, verify, TestFailed, TESTFN
+import unittest
+from test.test_support import verbose, TESTFN, run_unittest
 
+
 filename = TESTFN
 
-g = gdbm.open(filename, 'c')
-verify(g.keys() == [])
-g['a'] = 'b'
-g['12345678910'] = '019237410982340912840198242'
-a = g.keys()
-if verbose:
-    print 'Test gdbm file keys: ', a
+class TestGdbm(unittest.TestCase):
+    
+    def tearDown(self):
+        try:
+            import os
+            os.unlink(filename)
+        except:
+            pass
+    
+    def test_it(self):
+        g = gdbm.open(filename, 'c')
+        self.assertEqual(g.keys(), [])
+        g['a'] = 'b'
+        g['12345678910'] = '019237410982340912840198242'
+        a = g.keys()
+        if verbose:
+            print 'Test gdbm file keys: ', a
 
-g.has_key('a')
-g.close()
-try:
-    g['a']
-except error:
-    pass
-else:
-    raise TestFailed, "expected gdbm.error accessing closed database"
-g = gdbm.open(filename, 'r')
-g.close()
-g = gdbm.open(filename, 'w')
-g.close()
-g = gdbm.open(filename, 'n')
-g.close()
-try:
-    g = gdbm.open(filename, 'rx')
-    g.close()
-except error:
-    pass
-else:
-    raise TestFailed, "expected gdbm.error when passing invalid open flags"
+        g.has_key('a')
+        g.close()
+        # try access a closed database
+        self.assertRaises(gdbm.error, lambda: g['a'])
+        g = gdbm.open(filename, 'r')
+        g.close()
+        g = gdbm.open(filename, 'w')
+        g.close()
+        g = gdbm.open(filename, 'n')
+        g.close()
+        # try pass an invalid open flag
+        self.assertRaises(gdbm.error, lambda: gdbm.open(filename, 'rx').close())
 
-try:
-    import os
-    os.unlink(filename)
-except:
-    pass
+
+def test_main():
+    run_unittest(TestGdbm)
+    
+if __name__ == '__main__':
+    test_main()