Merge lp:~pwlars/ubuntu-test-cases/touch-add-krillin-11-15 into lp:ubuntu-test-cases/touch

Proposed by Paul Larson
Status: Merged
Merged at revision: 365
Proposed branch: lp:~pwlars/ubuntu-test-cases/touch-add-krillin-11-15
Merge into: lp:ubuntu-test-cases/touch
Diff against target: 15 lines (+5/-0)
1 file modified
scripts/device_info.py (+5/-0)
To merge this branch: bzr merge lp:~pwlars/ubuntu-test-cases/touch-add-krillin-11-15
Reviewer Review Type Date Requested Status
Ubuntu Test Case Developers Pending
Review via email: mp+247996@code.launchpad.net

Description of the change

This is not ideal, because they have not yet instrumented the devices and we don't have that bit to put in yet. But in the interest of making sure we don't lose track of those IDs we should go ahead and put the information we do have into the config data.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'scripts/device_info.py'
2--- scripts/device_info.py 2015-01-26 15:04:13 +0000
3+++ scripts/device_info.py 2015-01-29 15:35:22 +0000
4@@ -207,6 +207,11 @@
5 relay_url="http://decatur.ubuntu-ci",
6 bank=2, power_pin=0, volume_up_pin=1,
7 volume_down_pin=2),
8+ "krillin-11": TouchDevice("krillin", "JB072312"),
9+ "krillin-12": TouchDevice("krillin", "JB071487"),
10+ "krillin-13": TouchDevice("krillin", "JB044235"),
11+ "krillin-14": TouchDevice("krillin", "JB072205"),
12+ "krillin-15": TouchDevice("krillin", "JB071743"),
13 "ps-mako-01": TouchDevice("mako", "0090f741e3d141bc"),
14 "ps-mako-02": TouchDevice("mako", "04ccca120acd4dea"),
15 "ps-mako-03": TouchDevice("mako", "04cb53b598546534"),

Subscribers

People subscribed via source and target branches