Merge lp:~mwhudson/lava-dispatcher/lava-test-shell-log-lineno into lp:lava-dispatcher

[Michael Hudson-Doyle]

This branch contains the fix for bug 1097094 and incidentally the fix for bug 1099258.

[Andy Doan (doanac)]

review: Approve

[Antonio Terceiro (terceiro)]

On Mon, Jan 14, 2013 at 03:11:22AM -0000, Michael Hudson-Doyle wrote:
> === modified file 'lava_dispatcher/actions/lava_test_shell.py'
> --- lava_dispatcher/actions/lava_test_shell.py 2013-01-09 20:57:25 +0000
> +++ lava_dispatcher/actions/lava_test_shell.py 2013-01-14 03:10:25 +0000
> @@ -125,6 +125,7 @@
> from lava_dispatcher import utils
>
> from lava_dispatcher.actions import BaseAction
> +from lava_dispatcher.client.base import wait_for_prompt
> from lava_dispatcher.device.target import Target
> from lava_dispatcher.downloader import download_image
>
> @@ -454,7 +455,7 @@
> signal_director = SignalDirector(self.client, testdefs_by_uuid)
>
> with target.runner() as runner:
> - runner.run("") # make sure we have a shell prompt
> + wait_for_prompt(runner._connection, target.deployment_data['TESTER_PS1_PATTERN'], timeout)
> runner._connection.sendline("%s/bin/lava-test-runner" % target.deployment_data['lava_test_dir'])
> start = time.time()
> if timeout == -1:

Cool. Every time I look at those wait_for_prompt calls I think that
should be a method of the runner object itself. Something like this:
https://code.launchpad.net/~terceiro/lava-dispatcher/wait-for-prompt/+merge/143143

--
Antonio Terceiro
Software Engineer - Linaro
http://www.linaro.org

[Andy Doan (doanac)]

note: i added a response to antonio's MP:

 https://code.launchpad.net/~terceiro/lava-dispatcher/wait-for-prompt/+merge/143143

that outlines how I'd check this in

[lp:~mwhudson/lava-dispatcher/lava-test-shell-log-lineno]

531. By Michael Hudson-Doyle on 2013-01-14

merge trunk