Strong timeout handle. Do not produce fake positive scenarios

Author: penguinolog

exec_helpers/async_api/subprocess_runner.py

@@ -137,20 +137,11 @@ async def poll_stderr() -> None:
             result.exit_code = exit_code
             return result
         except asyncio.TimeoutError:
-            try:
-                # kill -9 for all subprocesses
-                _subprocess_helpers.kill_proc_tree(async_result.interface.pid)
+            # kill -9 for all subprocesses
+            _subprocess_helpers.kill_proc_tree(async_result.interface.pid)
+            exit_code = await asyncio.wait_for(async_result.interface.wait(), timeout=0.001)
+            if exit_code is None:
                 async_result.interface.kill()  # kill -9
-            except OSError:
-                # Wait for 1 ms: check close
-                exit_code = await asyncio.wait_for(async_result.interface.wait(), timeout=0.001)
-                if exit_code is not None:  # Nothing to kill
-                    self.logger.warning(
-                        "{!s} has been completed just after timeout: please validate timeout.".format(command)
-                    )
-                    result.exit_code = exit_code
-                    return result
-                raise  # Some other error
         finally:
             stdout_task.cancel()
             stderr_task.cancel()

exec_helpers/subprocess_runner.py

@@ -148,31 +148,15 @@ def close_streams() -> None:
 
         try:
             exit_code = async_result.interface.wait(timeout=timeout)  # Wait real timeout here
-        except subprocess.TimeoutExpired:
-            exit_code = async_result.interface.poll()  # Update exit code
-
-        # Process closed?
-        if exit_code is not None:
             concurrent.futures.wait([stdout_future, stderr_future], timeout=0.1)  # Minimal timeout to complete polling
             result.exit_code = exit_code
-            close_streams()
             return result
-        # Kill not ended process and wait for close
-        try:
+        except subprocess.TimeoutExpired:
             # kill -9 for all subprocesses
             _subprocess_helpers.kill_proc_tree(async_result.interface.pid)
-            async_result.interface.kill()  # kill -9
-            # Force stop cycle if no exit code after kill
-        except OSError:
             exit_code = async_result.interface.poll()
-            if exit_code is not None and exit_code not in {-9, -15}:  # Nothing to kill
-                self.logger.warning(
-                    "{!s} has been completed just after timeout: please validate timeout.".format(command)
-                )
-                concurrent.futures.wait([stdout_future, stderr_future], timeout=0.1)
-                result.exit_code = exit_code
-                return result
-            raise  # Some other error
+            if exit_code is None:
+                async_result.interface.kill()  # kill -9
         finally:
             stdout_future.cancel()
             stderr_future.cancel()
@@ -188,7 +172,7 @@ def close_streams() -> None:
 
         wait_err_msg = _log_templates.CMD_WAIT_ERROR.format(result=result, timeout=timeout)
         self.logger.debug(wait_err_msg)
-        raise exceptions.ExecHelperTimeoutError(result=result, timeout=timeout)
+        raise exceptions.ExecHelperTimeoutError(result=result, timeout=timeout)  # type: ignore
 
     def execute_async(  # pylint: disable=arguments-differ
         self,

test/async_api/test_subprocess_special.py

@@ -80,10 +80,7 @@ async def read_stream(stream: FakeFileStream):
     "positive_verbose": dict(stdout=(b" \n", b"2\n", b"3\n", b" \n"), verbose=True),
     "no_stdout": dict(),
     "IOError_on_stdout_read": dict(stdout=(b" \n", b"2\n", IOError())),
-    "TimeoutError": dict(ec=(asyncio.TimeoutError(),), stdout=(), expect_exc=exec_helpers.ExecHelperTimeoutError),
-    "TimeoutError_closed": dict(
-        ec=(asyncio.TimeoutError(), 0), stdout=(b" \n", b"2\n", b"3\n", b" \n"), kill=(OSError(),)
-    ),
+    "TimeoutError": dict(ec=(asyncio.TimeoutError(), None), stdout=(), expect_exc=exec_helpers.ExecHelperTimeoutError),
     "TimeoutError_no_kill": dict(ec=(asyncio.TimeoutError(), None), stdout=(), kill=(OSError(),), expect_exc=OSError),
     "stdin_closed_PIPE_windows": dict(stdout=(b" \n", b"2\n", b"3\n", b" \n"), stdin="Warning", write=einval_exc),
     "stdin_broken_PIPE": dict(stdout=(b" \n", b"2\n", b"3\n", b" \n"), stdin="Warning", write=epipe_exc),
@@ -114,7 +111,6 @@ def pytest_generate_tests(metafunc):
                 "no_stdout",
                 "IOError_on_stdout_read",
                 "TimeoutError",
-                "TimeoutError_closed",
                 "TimeoutError_no_kill",
                 "stdin_closed_PIPE_windows",
                 "stdin_broken_PIPE",

test/test_subprocess_special.py

@@ -76,13 +76,10 @@ def read_stream(stream: FakeFileStream):
     "no_stdout": dict(),
     "IOError_on_stdout_read": dict(stdout=(b" \n", b"2\n", IOError())),
     "TimeoutError": dict(
-        ec=(timeout_expired_exc,), poll=(None, None, None,), stdout=(), expect_exc=exec_helpers.ExecHelperTimeoutError
-    ),
-    "TimeoutError_closed": dict(
-        ec=(timeout_expired_exc, 0), poll=(None, 0), stdout=(b" \n", b"2\n", b"3\n", b" \n"), kill=(OSError(),)
+        ec=(timeout_expired_exc,), poll=(None,), stdout=(), expect_exc=exec_helpers.ExecHelperTimeoutError
     ),
     "TimeoutError_no_kill": dict(
-        ec=(timeout_expired_exc,), poll=(None, None, None,), stdout=(), kill=(OSError(),), expect_exc=OSError
+        ec=(timeout_expired_exc,), poll=(None,), stdout=(), kill=(OSError(),), expect_exc=OSError
     ),
     "stdin_closed_PIPE_windows": dict(stdout=(b" \n", b"2\n", b"3\n", b" \n"), stdin="Warning", write=einval_exc),
     "stdin_broken_PIPE": dict(stdout=(b" \n", b"2\n", b"3\n", b" \n"), stdin="Warning", write=epipe_exc),
@@ -113,7 +110,6 @@ def pytest_generate_tests(metafunc):
                 "no_stdout",
                 "IOError_on_stdout_read",
                 "TimeoutError",
-                "TimeoutError_closed",
                 "TimeoutError_no_kill",
                 "stdin_closed_PIPE_windows",
                 "stdin_broken_PIPE",