diff options
| author | Senthil Kumaran S <senthil.kumaran@linaro.org> | 2018-04-03 07:30:05 +0530 |
|---|---|---|
| committer | Senthil Kumaran S <senthil.kumaran@linaro.org> | 2018-04-03 07:39:39 +0530 |
| commit | 8a7d655af1a241f247982780085e6c53765b7546 (patch) | |
| tree | 2ca23c77c35494174b8c3acacd8c7237a00e8a55 /lava_dispatcher/actions/test | |
| parent | 1854a1ddc9528abe12335cb5e4d7a193867dd16b (diff) | |
Revert "shell: wait for prompt between each command"
It interferes with running LXC device based jobs. Needs re-work.
This reverts commit 0e30433587e57453d4d28fb43c94c1b33ad9b5ce.
Change-Id: I7e5a4acdd743d177b439da5048a71a50858cea9d
Diffstat (limited to 'lava_dispatcher/actions/test')
| -rw-r--r-- | lava_dispatcher/actions/test/shell.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lava_dispatcher/actions/test/shell.py b/lava_dispatcher/actions/test/shell.py index 9be601f89..932a48cfd 100644 --- a/lava_dispatcher/actions/test/shell.py +++ b/lava_dispatcher/actions/test/shell.py @@ -224,6 +224,8 @@ class TestShellAction(TestAction): # FIXME: This should be logged whenever prompt_str is changed, by the connection object. self.logger.debug("Setting default test shell prompt %s", connection.prompt_str) connection.timeout = self.connection_timeout + # force an initial prompt - not all shells will respond without an excuse. + connection.sendline(connection.check_char) self.wait(connection) # use the string instead of self.name so that inheriting classes (like multinode) @@ -237,7 +239,6 @@ class TestShellAction(TestAction): if pre_command_list and running == 0: for command in pre_command_list: connection.sendline(command, delay=self.character_delay) - self.wait(connection) if lava_test_results_dir is None: raise JobError("Nothing to run. Maybe the 'deploy' stage is missing, " @@ -245,10 +246,8 @@ class TestShellAction(TestAction): self.logger.debug("Using %s" % lava_test_results_dir) connection.sendline('ls -l %s/' % lava_test_results_dir, delay=self.character_delay) - self.wait(connection) if lava_test_sh_cmd: connection.sendline('export SHELL=%s' % lava_test_sh_cmd, delay=self.character_delay) - self.wait(connection) try: feedbacks = [] @@ -292,7 +291,6 @@ class TestShellAction(TestAction): if bytes_read > 1: self.logger.debug("Listened to connection for namespace '%s' done", feedback[0]) last_check = time.time() - self.wait(connection) finally: if self.current_run is not None: self.logger.error("Marking unfinished test run as failed") |