mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-02 05:12:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-31026: Fix test_dbm if dbm.ndbm is build with Berkeley DB. (GH-6632)

Browse source 
(cherry picked from commit 70af06cdc4)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
This commit is contained in:
Miss Islington (bot) 2018-04-29 06:37:21 -07:00 • committed by GitHub
parent ee95feb69d
commit e57d3e3a13
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Lib/test/test_dbm.py
View file

@ -38,8 +38,7 @@ def delete_files():
class AnyDBMTestCase: class AnyDBMTestCase:
_dict = {'0': b'', _dict = {'a': b'Python:',
'a': b'Python:',
'b': b'Programming', 'b': b'Programming',
'c': b'the', 'c': b'the',
'd': b'way', 'd': b'way',
@ -109,6 +108,20 @@ class AnyDBMTestCase:
keys = self.keys_helper(f) keys = self.keys_helper(f)
f.close() f.close()
def test_empty_value(self):
if getattr(dbm._defaultmod, 'library', None) == 'Berkeley DB':
self.skipTest("Berkeley DB doesn't distinguish the empty value "
"from the absent one")
f = dbm.open(_fname, 'c')
self.assertEqual(f.keys(), [])
f[b'empty'] = b''
self.assertEqual(f.keys(), [b'empty'])
self.assertIn(b'empty', f)
self.assertEqual(f[b'empty'], b'')
self.assertEqual(f.get(b'empty'), b'')
self.assertEqual(f.setdefault(b'empty'), b'')
f.close()
def test_anydbm_access(self): def test_anydbm_access(self):
self.init_db() self.init_db()
f = dbm.open(_fname, 'r') f = dbm.open(_fname, 'r')

14
Lib/test/test_dbm_ndbm.py
View file

@ -36,6 +36,20 @@ class DbmTestCase(unittest.TestCase):
self.assertEqual(self.d[b'xxx'], b'foo') self.assertEqual(self.d[b'xxx'], b'foo')
self.d.close() self.d.close()
def test_empty_value(self):
if dbm.ndbm.library == 'Berkeley DB':
self.skipTest("Berkeley DB doesn't distinguish the empty value "
"from the absent one")
self.d = dbm.ndbm.open(self.filename, 'c')
self.assertEqual(self.d.keys(), [])
self.d['empty'] = ''
self.assertEqual(self.d.keys(), [b'empty'])
self.assertIn(b'empty', self.d)
self.assertEqual(self.d[b'empty'], b'')
self.assertEqual(self.d.get(b'empty'), b'')
self.assertEqual(self.d.setdefault(b'empty'), b'')
self.d.close()
def test_modes(self): def test_modes(self):
for mode in ['r', 'rw', 'w', 'n']: for mode in ['r', 'rw', 'w', 'n']:
try: try: