[Python-checkins] bpo-33901: Fix test_dbm_gnu for gdbm 1.15 (GH-7798)

Tue Jun 19 12:45:49 EDT 2018

https://github.com/python/cpython/commit/fe8122d7b7c747fc344dde8467b09de6b5888d01
commit: fe8122d7b7c747fc344dde8467b09de6b5888d01
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2018年06月19日T09:45:39-07:00
summary:
bpo-33901: Fix test_dbm_gnu for gdbm 1.15 (GH-7798)
Fix test_dbm_gnu.test_reorganize() on macOS with gdbm 1.15: add a
larger value to make sure that the file size changes.
(cherry picked from commit 13c79c677f9ec9437c82eda72fa1c2d288d8fceb)
Co-authored-by: Victor Stinner <vstinner at redhat.com>
files:
A Misc/NEWS.d/next/Tests/2018-06-19-14-04-21.bpo-33901.OFW1Sr.rst
M Lib/test/test_dbm_gnu.py

diff --git a/Lib/test/test_dbm_gnu.py b/Lib/test/test_dbm_gnu.py
index 463d34341155..379601ad86de 100644
--- a/Lib/test/test_dbm_gnu.py
+++ b/Lib/test/test_dbm_gnu.py
@@ -72,9 +72,13 @@ def test_reorganize(self):
 self.g = gdbm.open(filename, 'c')
 size0 = os.path.getsize(filename)
 
- self.g['x'] = 'x' * 10000
+ # bpo-33901: on macOS with gdbm 1.15, an empty database uses 16 MiB
+ # and adding an entry of 10,000 B has no effect on the file size.
+ # Add size0 bytes to make sure that the file size changes.
+ value_size = max(size0, 10000)
+ self.g['x'] = 'x' * value_size
 size1 = os.path.getsize(filename)
- self.assertTrue(size0 < size1)
+ self.assertGreater(size1, size0)
 
 del self.g['x']
 # 'size' is supposed to be the same even after deleting an entry.
@@ -82,7 +86,8 @@ def test_reorganize(self):
 
 self.g.reorganize()
 size2 = os.path.getsize(filename)
- self.assertTrue(size1 > size2 >= size0)
+ self.assertLess(size2, size1)
+ self.assertGreaterEqual(size2, size0)
 
 def test_context_manager(self):
 with gdbm.open(filename, 'c') as db:
diff --git a/Misc/NEWS.d/next/Tests/2018-06-19-14-04-21.bpo-33901.OFW1Sr.rst b/Misc/NEWS.d/next/Tests/2018-06-19-14-04-21.bpo-33901.OFW1Sr.rst
new file mode 100644
index 000000000000..2a2dec3e9fa1
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2018-06-19-14-04-21.bpo-33901.OFW1Sr.rst
@@ -0,0 +1,2 @@
+Fix test_dbm_gnu on macOS with gdbm 1.15: add a larger value to make sure that
+the file size changes.
