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

[Andy Doan]

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

[Michael Hudson-Doyle (mwhudson)]

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

review: Approve

[Andy Doan (doanac)]

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

=== modified file 'lava_dispatcher/client/targetdevice.py'
--- lava_dispatcher/client/targetdevice.py	2012-11-21 22:07:45 +0000
+++ lava_dispatcher/client/targetdevice.py	2013-01-22 23:52:19 +0000
@@ -66,6 +66,9 @@
             self.target_device.deploy_linaro_prebuilt(image)
 
     def _boot_linaro_image(self):
+        if self.proc:
+            logging.warning('device already powered on, powering off first')
+            self.target_device.power_off(self.proc)
         self.proc = self.target_device.power_on()
 
     def _boot_linaro_android_image(self):