Merge lp:~mterry/unity8/new-adbd into lp:unity8

[Michael Terry]

Add support to unlock-device for the new adbd coming down the pipeline.

Add support to unlock-device for the new adbd coming down the pipeline.

(This actually is reverting to old code that was working, but I mistakenly tried to update for new adbd only to realize that I was in fact breaking support for the new adbd. Whoops.)

While I was there, I bumped the wait from 20s to 30s. Not that I've noticed a problem with 20s. I just felt, you know, we have different devices of different speeds. I'd like a little extra buffer.

== Checklist ==

 * 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?
 - NA

 * If you changed the UI, has there been a design review?
 - NA

[Oliver Grawert (ogra)]

looks good ...

review: Approve

[lp:~mterry/unity8/new-adbd]

1227. By Michael Terry on 2014-08-29

fix comment

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1226
http://jenkins.qa.ubuntu.com/job/unity8-ci/4182/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4251
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1183
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1276
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1276
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4064
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5503
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5503/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12380

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1227
http://jenkins.qa.ubuntu.com/job/unity8-ci/4185/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4260
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1186/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1279
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1279
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4071
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5512
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5512/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12393

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

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

 * Did CI run pass?
popover borked test by SDK

review: Approve

[Albert Astals Cid (aacid)]

Actually it seems autopiloot tests failed too? I've triggered a rebuild, let's see what this run says.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1227
http://jenkins.qa.ubuntu.com/job/unity8-ci/4189/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4284
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1190
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1283
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1283
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4094
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5536
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5536/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12427

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

review: Needs Fixing (continuous-integration)

Unmerged revisions

=== modified file 'tools/unlock-device'
--- tools/unlock-device	2014-08-28 19:58:48 +0000
+++ tools/unlock-device	2014-08-29 16:04:54 +0000
@@ -19,13 +19,12 @@
 
 eval "$WAIT_COMMAND"
 
-# Force a sleep of twenty no matter what, since we may need to wait for unity8
+# Force a sleep no matter what, since we may need to wait for unity8
 # to finish coming up (it's hard to tell when the greeter is actually rendered)
-sleep 20
-
-GDBUS_CMD="gdbus call --session --dest com.canonical.UnityGreeter --object-path / --method com.canonical.UnityGreeter.HideGreeter && echo Greeter unlocked"
-
-UNLOCK_OUTPUT=$(adb shell "if [ \"\$(id -u)\" = 0 ]; then sudo -u phablet -i $GDBUS_CMD; else $GDBUS_CMD; fi" 2>&1)
+sleep 30
+
+# We need to go through sudo to get a proper environment for dbus set up
+UNLOCK_OUTPUT=$(adb shell "sudo -u phablet -i gdbus call --session --dest com.canonical.UnityGreeter --object-path / --method com.canonical.UnityGreeter.HideGreeter && echo Greeter unlocked" 2>&1)
 if echo "$UNLOCK_OUTPUT" | grep 'Greeter unlocked' >/dev/null; then
     echo "I: Unlock passed"
     exit 0