Unity 8

Merge lp://qastaging/~doanac/unity8/unlock-device-emulator into lp://qastaging/unity8

  1. unlock-device-emulator
  2. Merge into trunk
Proposed by Andy Doan
Status: Merged
Approved by: Michael Terry
Approved revision: 893
Merged at revision: 904
Proposed branch: lp://qastaging/~doanac/unity8/unlock-device-emulator
Merge into: lp://qastaging/unity8
Diff against target: 24 lines (+2/-4)
1 file modified
tools/unlock-device (+2/-4)
To merge this branch: bzr merge lp://qastaging/~doanac/unity8/unlock-device-emulator
Reviewer Review Type Date Requested Status
Michael Terry Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+219573@code.qastaging.launchpad.net

Commit message

unlock_device: support more complex reboot/wait cycles

Currently this script only allows you to override how to "wait" on the
device. This changes the logic to also support how you go about rebooting
the device.

This is handy for the ubuntu-emulator because adb-reboot is not
currently supported. However, we also have a more sophisticated,
fool-proof way we reboot/wait in the CI lab that would be nice
to take advantage of:

 http://bazaar.launchpad.net/~ubuntu-test-case-dev/ubuntu-test-cases/touch/view/head:/scripts/reboot-and-wait

Description of the change

* Are there any related MPs required for this MP to build/function as expected? Please list.
  no
* Did you perform an exploratory manual test run of your code change and any related functionality?
  yes
* Did you make sure that your branch does not contain spurious tags?
  yes
* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
  n/a
* If you changed the UI, has there been a design review?
  n/a

To post a comment you must log in.
Revision history for this message
Michael Terry (mterry) wrote :

Looks fine to me, but won't this break any current CI scripts that use -W? (do any?)

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:893
http://jenkins.qa.ubuntu.com/job/unity8-ci/2965/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/224
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1825/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/59
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/59
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/59/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/59
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/716
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/459
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/459/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7169

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2965/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Andy Doan (doanac) wrote :

On 05/14/2014 01:04 PM, Michael Terry wrote:

> Looks fine to me, but won't this break any current CI scripts that use -W? (do any?)

We aren't using the -W (yet) in CI.

Revision history for this message
Michael Terry (mterry) wrote :

Review checklist:

 * Did you perform an exploratory manual test run of the code change and any related functionality?
 - Yes

 * Did CI run pass? If not, please explain why.
 - Unrelated failures

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches