Address review comments (bare assert, don't use ceil())

Author: giampaolo

Lib/subprocess.py

@@ -51,7 +51,6 @@
 import threading
 import warnings
 import contextlib
-import math
 import select
 from time import monotonic as _time
 import types
@@ -2121,7 +2120,7 @@ def _wait_pidfd(self, timeout):
             try:
                 poller = select.poll()
                 poller.register(pidfd, select.POLLIN)
-                events = poller.poll(math.ceil(timeout * 1000))
+                events = poller.poll(timeout * 1000)
                 if not events:
                     raise TimeoutExpired(self.args, timeout)
                 return True
@@ -2147,7 +2146,7 @@ def _wait_kqueue(self, timeout):
                 )
                 try:
                     events = kq.control([kev], 1, timeout)  # wait
-                except OSError as err:  # should never happen
+                except OSError:
                     return False
                 else:
                     if not events:

Lib/test/test_subprocess.py

@@ -4114,7 +4114,7 @@ def assert_fast_waitpid_error(self, patch_point):
             with self.assertRaises(subprocess.TimeoutExpired):
                 p.wait(timeout=0.0001)
             self.assertEqual(p.wait(timeout=support.SHORT_TIMEOUT), 0)
-        assert m.called
+        self.assertTrue(m.called)
 
     @unittest.skipIf(not CAN_USE_PIDFD_OPEN, reason="needs pidfd_open()")
     def test_wait_pidfd_open_error(self):
@@ -4140,7 +4140,7 @@ def test_kqueue_control_error(self):
             with self.assertRaises(subprocess.TimeoutExpired):
                 p.wait(timeout=0.0001)
             self.assertEqual(p.wait(timeout=support.SHORT_TIMEOUT), 0)
-        assert m.called
+        self.assertTrue(m.called)
 
     def assert_wait_race_condition(self, patch_target, real_func):
         # Call pidfd_open() / kqueue(), then terminate the process.
@@ -4160,7 +4160,7 @@ def wrapper(*args, **kwargs):
 
         with mock.patch(patch_target, side_effect=wrapper) as m:
             status = p.wait(timeout=support.SHORT_TIMEOUT)
-        assert m.called
+        self.assertTrue(m.called)
         self.assertEqual(status, 0)
 
     @unittest.skipIf(not CAN_USE_PIDFD_OPEN, reason="needs pidfd_open()")