Merge lp://qastaging/~doanac/lava-dispatcher/fm-android-support into lp://qastaging/lava-dispatcher
Proposed by
Andy Doan
| Status: | Rejected |
|---|---|
| Rejected by: | Andy Doan |
| Proposed branch: | lp://qastaging/~doanac/lava-dispatcher/fm-android-support |
| Merge into: | lp://qastaging/lava-dispatcher |
| Diff against target: |
254 lines (+178/-16) (has conflicts) 2 files modified
lava_dispatcher/client/base.py (+11/-16) lava_dispatcher/client/fastmodel.py (+167/-0) Text conflict in lava_dispatcher/client/base.py Text conflict in lava_dispatcher/client/fastmodel.py |
| To merge this branch: | bzr merge lp://qastaging/~doanac/lava-dispatcher/fm-android-support |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Amit Pundir | Pending | ||
| Linaro Validation Team | Pending | ||
|
Review via email:
|
|||
Description of the change
This fixes the last few things that were required to get android fast models, booting, and using ADB properly
To post a comment you must log in.
Revision history for this message
| Michael Hudson-Doyle (mwhudson) wrote | # |
Unmerged revisions
- 332. By Andy Doan
-
fix option support for enable_
network_ after_boot_ android this code always returned true based on how it was written
- 331. By Andy Doan
-
update fastmodel client for proper android support
base.py:
* don't assume the default network interface is used for ADB. In
the case of fast model's it has to be a bridged "lo" device.* don't attempt to get ip in get_default_nic_ip. we already have
code to get the IP address in the _enable_network function* the sleep between check_device_state needed to be a bit bigger
* the wait for home screen had to be increased
- 330. By Andy Doan
-
merge fastmodel support
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Not sure what happened here but there are conflicts in the diff.
Also, I think the new version of get_default_nic_ip will fail with a NameError if _get_default_
15 logging.
16 pass
to "return None"