x
/
tobiko
Code Issues Proposed changes

Merge "Use configured process timeout when closing a process"

This commit is contained in:
Zuul 2024-02-03 13:59:55 +00:00 committed by Gerrit Code Review
parent b6d63c401e be26dd6b78
commit 9c247d565d
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tobiko/shell/ping/_ping.py
View File

@ -328,7 +328,7 @@ def execute_ping(parameters, ssh_client=None, check=True):
try:
result = sh.execute(command=command,
ssh_client=ssh_client,
timeout=parameters.deadline + 2.,
timeout=parameters.deadline + 3.,
expect_exit_status=None,
network_namespace=parameters.network_namespace)
except sh.ShellError as ex:

2
tobiko/shell/sh/_process.py
View File

@ -197,6 +197,8 @@ class ShellProcessFixture(tobiko.SharedFixture):
LOG.exception("Error closing STDERR stream: %r", self.stderr)
def close(self, timeout: tobiko.Seconds = None):
if timeout is None:
timeout = self.parameters.timeout
self.close_stdin()
try:
# Drain all incoming data from STDOUT and STDERR

1
tobiko/tripleo/pacemaker.py
View File

@ -413,6 +413,7 @@ def run_pcs_resource_operation(resource: str,
output = execute_pcs(command_args,
ssh_client=ssh_client,
add_stderr=add_stderr,
timeout=operation_wait + 10.,
sudo=True)
except sh.ShellCommandFailed as exc:
if attempt.is_last: