Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Proposal to fix #154 (v2) #161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Dec 10, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Code normalization
- New debug checks
- Normalization
  • Loading branch information
dmitry-lipetsk committed Dec 10, 2024
commit cd0b5f8671d61214afb2985adb83cd3efb9b852a
15 changes: 11 additions & 4 deletions testgres/operations/local_ops.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,25 +86,32 @@ def _run_command__generic(self, cmd, shell, input, stdin, stdout, stderr, get_pr
if not get_process:
input_prepared = Helpers.PrepareProcessInput(input, encoding) # throw

assert input_prepared is None or (type(input_prepared) == bytes) # noqa: E721

process = subprocess.Popen(
cmd,
shell=shell,
stdin=stdin or subprocess.PIPE if input is not None else None,
stdout=stdout or subprocess.PIPE,
stderr=stderr or subprocess.PIPE,
)
assert not (process is None)
if get_process:
return process, None, None
try:
output, error = process.communicate(input=input_prepared, timeout=timeout)
if encoding:
output = output.decode(encoding)
error = error.decode(encoding)
return process, output, error
except subprocess.TimeoutExpired:
process.kill()
raise ExecUtilException("Command timed out after {} seconds.".format(timeout))

assert type(output) == bytes # noqa: E721
assert type(error) == bytes # noqa: E721

if encoding:
output = output.decode(encoding)
error = error.decode(encoding)
return process, output, error

def _run_command(self, cmd, shell, input, stdin, stdout, stderr, get_process, timeout, encoding):
"""Execute a command and return the process and its output."""
if os.name == 'nt' and stdout is None: # Windows
Expand Down
3 changes: 3 additions & 0 deletions testgres/operations/remote_ops.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,15 @@ def exec_command(self, cmd, wait_exit=False, verbose=False, expect_error=False,
if not get_process:
input_prepared = Helpers.PrepareProcessInput(input, encoding) # throw

assert input_prepared is None or (type(input_prepared) == bytes) # noqa: E721

ssh_cmd = []
if isinstance(cmd, str):
ssh_cmd = ['ssh', self.ssh_dest] + self.ssh_args + [cmd]
elif isinstance(cmd, list):
ssh_cmd = ['ssh', self.ssh_dest] + self.ssh_args + cmd
process = subprocess.Popen(ssh_cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
assert not (process is None)
if get_process:
return process

Expand Down