From cbfcbb559cb2ff717a2afa863fbbbb6215fc1068 Mon Sep 17 00:00:00 2001 From: "a.lipay" Date: Wed, 9 Nov 2022 18:24:32 +0300 Subject: [PATCH] fix interactive ssh and tests Signed-off-by: a.lipay --- src/neofs_testlib/shell/ssh_shell.py | 4 +++- tests/test_ssh_shell.py | 11 ++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/neofs_testlib/shell/ssh_shell.py b/src/neofs_testlib/shell/ssh_shell.py index 2b0bae3..f4870b4 100644 --- a/src/neofs_testlib/shell/ssh_shell.py +++ b/src/neofs_testlib/shell/ssh_shell.py @@ -142,7 +142,9 @@ class SSHShell(Shell): @log_command def _exec_interactive(self, command: str, options: CommandOptions) -> CommandResult: - stdin, stdout, stderr = self._connection.exec_command(command, timeout=options.timeout) + stdin, stdout, stderr = self._connection.exec_command( + command, timeout=options.timeout, get_pty=True + ) for interactive_input in options.interactive_inputs: input = interactive_input.input if not input.endswith("\n"): diff --git a/tests/test_ssh_shell.py b/tests/test_ssh_shell.py index 849a2fd..a57b479 100644 --- a/tests/test_ssh_shell.py +++ b/tests/test_ssh_shell.py @@ -41,9 +41,8 @@ class TestSSHShellInteractive(TestCase): f'python3 -c "{script}"', CommandOptions(interactive_inputs=inputs) ) - # TODO: we have inconsistency with local shell here, ssh does not echo input into stdout self.assertEqual(0, result.return_code) - self.assertEqual(["Password:", "test"], get_output_lines(result)) + self.assertEqual(["Password: test", "test"], get_output_lines(result)) self.assertEqual("", result.stderr) def test_command_with_several_prompts(self): @@ -60,9 +59,10 @@ class TestSSHShellInteractive(TestCase): f'python3 -c "{script}"', CommandOptions(interactive_inputs=inputs) ) - # TODO: we have inconsistency with local shell here, ssh does not echo input into stdout self.assertEqual(0, result.return_code) - self.assertEqual(["Input1:", "test1", "Input2:", "test2"], get_output_lines(result)) + self.assertEqual( + ["Input1: test1", "test1", "Input2: test2", "test2"], get_output_lines(result) + ) self.assertEqual("", result.stderr) def test_invalid_command_with_check(self): @@ -73,7 +73,7 @@ class TestSSHShellInteractive(TestCase): self.shell.exec(f'python3 -c "{script}"', CommandOptions(interactive_inputs=inputs)) error = format_error_details(raised.exception) - self.assertIn("Error", error) + self.assertIn("SyntaxError", error) self.assertIn("return code: 1", error) def test_invalid_command_without_check(self): @@ -84,6 +84,7 @@ class TestSSHShellInteractive(TestCase): f'python3 -c "{script}"', CommandOptions(interactive_inputs=inputs, check=False), ) + self.assertIn("SyntaxError", result.stdout) self.assertEqual(1, result.return_code) def test_non_existing_binary(self):