diff options
Diffstat (limited to 'Lib/bsddb/test/test_dbshelve.py')
| -rw-r--r-- | Lib/bsddb/test/test_dbshelve.py | 74 |
1 files changed, 38 insertions, 36 deletions
diff --git a/Lib/bsddb/test/test_dbshelve.py b/Lib/bsddb/test/test_dbshelve.py index 752ebc3..cbc58ca 100644 --- a/Lib/bsddb/test/test_dbshelve.py +++ b/Lib/bsddb/test/test_dbshelve.py @@ -3,7 +3,7 @@ TestCases for checking dbShelve objects. """ import os, string -import tempfile, random +import random from types import * import unittest @@ -19,7 +19,8 @@ try: except ImportError: from test import test_support -from test_all import verbose +from test_all import verbose, get_new_environment_path, get_new_database_path + #---------------------------------------------------------------------- @@ -35,7 +36,7 @@ class DataClass: class DBShelveTestCase(unittest.TestCase): def setUp(self): - self.filename = tempfile.mktemp() + self.filename = get_new_database_path() self.do_open() def tearDown(self): @@ -91,15 +92,15 @@ class DBShelveTestCase(unittest.TestCase): print "keys:", k print "stats:", s - assert 0 == d.has_key(self.mk('bad key')) - assert 1 == d.has_key(self.mk('IA')) - assert 1 == d.has_key(self.mk('OA')) + self.assertEqual(0, d.has_key(self.mk('bad key'))) + self.assertEqual(1, d.has_key(self.mk('IA'))) + self.assertEqual(1, d.has_key(self.mk('OA'))) d.delete(self.mk('IA')) del d[self.mk('OA')] - assert 0 == d.has_key(self.mk('IA')) - assert 0 == d.has_key(self.mk('OA')) - assert len(d) == l-2 + self.assertEqual(0, d.has_key(self.mk('IA'))) + self.assertEqual(0, d.has_key(self.mk('OA'))) + self.assertEqual(len(d), l-2) values = [] for key in d.keys(): @@ -110,29 +111,29 @@ class DBShelveTestCase(unittest.TestCase): self.checkrec(key, value) dbvalues = d.values() - assert len(dbvalues) == len(d.keys()) + self.assertEqual(len(dbvalues), len(d.keys())) values.sort() dbvalues.sort() - assert values == dbvalues + self.assertEqual(values, dbvalues) items = d.items() - assert len(items) == len(values) + self.assertEqual(len(items), len(values)) for key, value in items: self.checkrec(key, value) - assert d.get(self.mk('bad key')) == None - assert d.get(self.mk('bad key'), None) == None - assert d.get(self.mk('bad key'), 'a string') == 'a string' - assert d.get(self.mk('bad key'), [1, 2, 3]) == [1, 2, 3] + self.assertEqual(d.get(self.mk('bad key')), None) + self.assertEqual(d.get(self.mk('bad key'), None), None) + self.assertEqual(d.get(self.mk('bad key'), 'a string'), 'a string') + self.assertEqual(d.get(self.mk('bad key'), [1, 2, 3]), [1, 2, 3]) d.set_get_returns_none(0) self.assertRaises(db.DBNotFoundError, d.get, self.mk('bad key')) d.set_get_returns_none(1) d.put(self.mk('new key'), 'new data') - assert d.get(self.mk('new key')) == 'new data' - assert d[self.mk('new key')] == 'new data' + self.assertEqual(d.get(self.mk('new key')), 'new data') + self.assertEqual(d[self.mk('new key')], 'new data') @@ -156,7 +157,7 @@ class DBShelveTestCase(unittest.TestCase): rec = c.next() del c - assert count == len(d) + self.assertEqual(count, len(d)) count = 0 c = d.cursor() @@ -169,7 +170,7 @@ class DBShelveTestCase(unittest.TestCase): self.checkrec(key, value) rec = c.prev() - assert count == len(d) + self.assertEqual(count, len(d)) c.set(self.mk('SS')) key, value = c.current() @@ -191,25 +192,25 @@ class DBShelveTestCase(unittest.TestCase): # override this in a subclass if the key type is different x = key[1] if key[0] == 'S': - assert type(value) == StringType - assert value == 10 * x + self.assertEqual(type(value), StringType) + self.assertEqual(value, 10 * x) elif key[0] == 'I': - assert type(value) == IntType - assert value == ord(x) + self.assertEqual(type(value), IntType) + self.assertEqual(value, ord(x)) elif key[0] == 'L': - assert type(value) == ListType - assert value == [x] * 10 + self.assertEqual(type(value), ListType) + self.assertEqual(value, [x] * 10) elif key[0] == 'O': - assert type(value) == InstanceType - assert value.S == 10 * x - assert value.I == ord(x) - assert value.L == [x] * 10 + self.assertEqual(type(value), InstanceType) + self.assertEqual(value.S, 10 * x) + self.assertEqual(value.I, ord(x)) + self.assertEqual(value.L, [x] * 10) else: - raise AssertionError, 'Unknown key type, fix the test' + self.assert_(0, 'Unknown key type, fix the test') #---------------------------------------------------------------------- @@ -246,12 +247,9 @@ class ThreadHashShelveTestCase(BasicShelveTestCase): class BasicEnvShelveTestCase(DBShelveTestCase): def do_open(self): - self.homeDir = homeDir = os.path.join( - tempfile.gettempdir(), 'db_home%d'%os.getpid()) - try: os.mkdir(homeDir) - except os.error: pass self.env = db.DBEnv() - self.env.open(homeDir, self.envflags | db.DB_INIT_MPOOL | db.DB_CREATE) + self.env.open(self.homeDir, + self.envflags | db.DB_INIT_MPOOL | db.DB_CREATE) self.filename = os.path.split(self.filename)[1] self.d = dbshelve.DBShelf(self.env) @@ -263,6 +261,10 @@ class BasicEnvShelveTestCase(DBShelveTestCase): self.env.close() + def setUp(self) : + self.homeDir = get_new_environment_path() + DBShelveTestCase.setUp(self) + def tearDown(self): self.do_close() test_support.rmtree(self.homeDir) |