Merge lp:~dpigott/lava-dispatcher/change-sdmux-inheritance into lp:lava-dispatcher

Proposed by Dave Pigott on 2013-09-11
Status: Merged
Merged at revision: 679
Proposed branch: lp:~dpigott/lava-dispatcher/change-sdmux-inheritance
Merge into: lp:lava-dispatcher
Diff against target: 32 lines (+4/-4)
1 file modified
lava_dispatcher/device/sdmux.py (+4/-4)
To merge this branch: bzr merge lp:~dpigott/lava-dispatcher/change-sdmux-inheritance
Reviewer Review Type Date Requested Status
Dave Pigott Approve on 2013-09-11
Review via email: mp+185070@code.launchpad.net
To post a comment you must log in.
Dave Pigott (dpigott) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lava_dispatcher/device/sdmux.py'
2--- lava_dispatcher/device/sdmux.py 2013-09-05 09:51:15 +0000
3+++ lava_dispatcher/device/sdmux.py 2013-09-11 14:44:13 +0000
4@@ -30,8 +30,8 @@
5 from lava_dispatcher.errors import (
6 CriticalError,
7 )
8-from lava_dispatcher.device.target import (
9- Target
10+from lava_dispatcher.device.master import (
11+ MasterImageTarget
12 )
13 from lava_dispatcher.client.lmc_utils import (
14 generate_android_image,
15@@ -62,7 +62,7 @@
16 os.close(int(f))
17
18
19-class SDMuxTarget(Target):
20+class SDMuxTarget(MasterImageTarget):
21 """
22 This adds support for the "sd mux" device. An SD-MUX device is a piece of
23 hardware that allows the host and target to both connect to the same SD
24@@ -100,7 +100,7 @@
25 with open('%s/etc/mkshrc' % d, 'a') as f:
26 f.write('\n# LAVA CUSTOMIZATIONS\n')
27 f.write('PS1="%s"\n' % self.ANDROID_TESTER_PS1)
28- self.deployment_data = Target.android_deployment_data
29+ self.deployment_data = MasterImageTarget.android_deployment_data
30
31 def deploy_android(self, boot, system, data):
32 scratch = self.scratch_dir

Subscribers

People subscribed via source and target branches