Merge lp:~doanac/lava-dispatcher/fm-licensing-bug into lp:lava-dispatcher

Proposed by Andy Doan
Status: Merged
Merged at revision: 541
Proposed branch: lp:~doanac/lava-dispatcher/fm-licensing-bug
Merge into: lp:lava-dispatcher
Diff against target: 13 lines (+3/-0)
1 file modified
lava_dispatcher/client/targetdevice.py (+3/-0)
To merge this branch: bzr merge lp:~doanac/lava-dispatcher/fm-licensing-bug
Reviewer Review Type Date Requested Status
Michael Hudson-Doyle (community) Approve
Review via email: mp+144415@code.launchpad.net

Description of the change

I thought I merged this last week, but must have only done unit testing. let's get this in.

To post a comment you must log in.
Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

Seems fine. Shouldn't the/a check be in power_on too though?

review: Approve
Revision history for this message
Andy Doan (doanac) wrote :

The power_on method isn't necesarily supposed to keep do resource tracking of the pexpect instance it returns.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lava_dispatcher/client/targetdevice.py'
2--- lava_dispatcher/client/targetdevice.py 2012-11-21 22:07:45 +0000
3+++ lava_dispatcher/client/targetdevice.py 2013-01-22 23:52:19 +0000
4@@ -66,6 +66,9 @@
5 self.target_device.deploy_linaro_prebuilt(image)
6
7 def _boot_linaro_image(self):
8+ if self.proc:
9+ logging.warning('device already powered on, powering off first')
10+ self.target_device.power_off(self.proc)
11 self.proc = self.target_device.power_on()
12
13 def _boot_linaro_android_image(self):

Subscribers

People subscribed via source and target branches