timeout message added

common_helper_process/fail_safe_subprocess.py

@@ -69,6 +69,7 @@ def execute_interactive_shell_command(shell_command, timeout=60, inputs={}):
         except pexpect.TIMEOUT:
             child.kill(SIGKILL)
             output += child.before
+            output += b'\n\nError: Execution timed out!'
             break
         except pexpect.EOF:
             output += child.before

test/test_fail_safe_subprocess.py

@@ -53,5 +53,5 @@ class TestProcessHelper(unittest.TestCase):
         script_path = os.path.join(get_dir_of_file(__file__), 'data/interactive.sh')
         output, ret_code = execute_interactive_shell_command(script_path, timeout=2)
         assert 'give me some input' in output
-        assert 'Error: Execution timed out!'
+        assert '\n\nError: Execution timed out!' in output
         assert ret_code > 0