Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 29, 2018
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions Lib/test/test_dbm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ def delete_files():


class AnyDBMTestCase:
_dict = {'0': b'',
'a': b'Python:',
_dict = {'a': b'Python:',
'b': b'Programming',
'c': b'the',
'd': b'way',
Expand Down Expand Up @@ -109,6 +108,20 @@ def test_anydbm_keys(self):
keys = self.keys_helper(f)
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):
self.init_db()
f = dbm.open(_fname, 'r')
Expand Down
14 changes: 14 additions & 0 deletions Lib/test/test_dbm_ndbm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,20 @@ def test_keys(self):
self.assertEqual(self.d[b'xxx'], b'foo')
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):
for mode in ['r', 'rw', 'w', 'n']:
try:
Expand Down