[Python-checkins] gh-60203: Always pass True/False as boolean arguments in tests (GH-99983)
serhiy-storchaka
webhook-mailer at python.org
Sun Dec 4 07:29:01 EST 2022
https://github.com/python/cpython/commit/76f43fc09af29401cc0cec7710b03e4dbf8a4578
commit: 76f43fc09af29401cc0cec7710b03e4dbf8a4578
branch: main
author: Serhiy Storchaka <storchaka at gmail.com>
committer: serhiy-storchaka <storchaka at gmail.com>
date: 2022-12-04T14:28:56+02:00
summary:
gh-60203: Always pass True/False as boolean arguments in tests (GH-99983)
Unless we explicitly test non-bool values.
files:
M Lib/test/_test_multiprocessing.py
M Lib/test/test_asyncio/test_ssl.py
M Lib/test/test_call.py
M Lib/test/test_capi/test_misc.py
M Lib/test/test_subprocess.py
diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
index a66f4f5b897c..2fa75eb4d113 100644
--- a/Lib/test/_test_multiprocessing.py
+++ b/Lib/test/_test_multiprocessing.py
@@ -6042,5 +6042,5 @@ def test_semlock_subclass(self):
class SemLock(_multiprocessing.SemLock):
pass
name = f'test_semlock_subclass-{os.getpid()}'
- s = SemLock(1, 0, 10, name, 0)
+ s = SemLock(1, 0, 10, name, False)
_multiprocessing.sem_unlink(name)
diff --git a/Lib/test/test_asyncio/test_ssl.py b/Lib/test/test_asyncio/test_ssl.py
index 5de9b7a14e87..aaf3c37101f5 100644
--- a/Lib/test/test_asyncio/test_ssl.py
+++ b/Lib/test/test_asyncio/test_ssl.py
@@ -1689,7 +1689,7 @@ def stop(self):
def run(self):
try:
with self._sock:
- self._sock.setblocking(0)
+ self._sock.setblocking(False)
self._run()
finally:
self._s1.close()
diff --git a/Lib/test/test_call.py b/Lib/test/test_call.py
index f148b5ebbc5a..c17528be97b4 100644
--- a/Lib/test/test_call.py
+++ b/Lib/test/test_call.py
@@ -559,7 +559,7 @@ def __index__(self):
self.kwargs.clear()
gc.collect()
return 0
- x = IntWithDict(dont_inherit=IntWithDict())
+ x = IntWithDict(optimize=IntWithDict())
# We test the argument handling of "compile" here, the compilation
# itself is not relevant. When we pass flags=x below, x.__index__() is
# called, which changes the keywords dict.
diff --git a/Lib/test/test_capi/test_misc.py b/Lib/test/test_capi/test_misc.py
index 1d30adaee921..06a51aa3cc21 100644
--- a/Lib/test/test_capi/test_misc.py
+++ b/Lib/test/test_capi/test_misc.py
@@ -138,8 +138,9 @@ def test_seq_bytes_to_charp_array(self):
class Z(object):
def __len__(self):
return 1
- self.assertRaises(TypeError, _posixsubprocess.fork_exec,
- 1,Z(),3,(1, 2),5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23)
+ with self.assertRaisesRegex(TypeError, 'indexing'):
+ _posixsubprocess.fork_exec(
+ 1,Z(),True,(1, 2),5,6,7,8,9,10,11,12,13,14,True,True,17,False,19,20,21,22,False)
# Issue #15736: overflow in _PySequence_BytesToCharpArray()
class Z(object):
def __len__(self):
@@ -147,7 +148,7 @@ def __len__(self):
def __getitem__(self, i):
return b'x'
self.assertRaises(MemoryError, _posixsubprocess.fork_exec,
- 1,Z(),3,(1, 2),5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23)
+ 1,Z(),True,(1, 2),5,6,7,8,9,10,11,12,13,14,True,True,17,False,19,20,21,22,False)
@unittest.skipUnless(_posixsubprocess, '_posixsubprocess required for this test.')
def test_subprocess_fork_exec(self):
@@ -157,7 +158,7 @@ def __len__(self):
# Issue #15738: crash in subprocess_fork_exec()
self.assertRaises(TypeError, _posixsubprocess.fork_exec,
- Z(),[b'1'],3,(1, 2),5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23)
+ Z(),[b'1'],True,(1, 2),5,6,7,8,9,10,11,12,13,14,True,True,17,False,19,20,21,22,False)
@unittest.skipIf(MISSING_C_DOCSTRINGS,
"Signature information for builtins requires docstrings")
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index 424a4a93b6f9..8713c73f87a0 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -3209,7 +3209,7 @@ def __int__(self):
1, 2, 3, 4,
True, True, 0,
None, None, None, -1,
- None, "no vfork")
+ None, True)
self.assertIn('fds_to_keep', str(c.exception))
finally:
if not gc_enabled:
More information about the Python-checkins
mailing list