anurindm/frostfs-testcases
1
0
Fork 0
forked from TrueCloudLab/frostfs-testcases
Code Pull requests Activity

Add logic to prepend ssh command with sudo.

Browse source
This commit is contained in:
Vladimir Domnich 2022-07-28 11:21:44 +03:00
parent 5a2c528324
commit 4e49931c19
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pytest_tests/helpers/ssh_helper.py
View file

@ -82,6 +82,8 @@ class HostClient:
@log_command @log_command
def exec_with_confirmation(self, cmd: str, confirmation: list, verify=True, timeout=10) -> SSHCommand: def exec_with_confirmation(self, cmd: str, confirmation: list, verify=True, timeout=10) -> SSHCommand:
if self.login and self.login != "root":
cmd = f"sudo {cmd}"
ssh_stdin, ssh_stdout, ssh_stderr = self.ssh_client.exec_command(cmd, timeout=timeout) ssh_stdin, ssh_stdout, ssh_stderr = self.ssh_client.exec_command(cmd, timeout=timeout)
for line in confirmation: for line in confirmation:
if not line.endswith('\n'): if not line.endswith('\n'):
@ -195,6 +197,8 @@ class HostClient:
def _inner_exec(self, cmd: str, timeout: int) -> SSHCommand: def _inner_exec(self, cmd: str, timeout: int) -> SSHCommand:
if not self.ssh_client: if not self.ssh_client:
self.create_connection() self.create_connection()
if self.login and self.login != "root":
cmd = f"sudo {cmd}"
for _ in range(self.SSH_CONNECTION_ATTEMPTS): for _ in range(self.SSH_CONNECTION_ATTEMPTS):
try: try:
_, stdout, stderr = self.ssh_client.exec_command(cmd, timeout=timeout) _, stdout, stderr = self.ssh_client.exec_command(cmd, timeout=timeout)