Merge lp:~unity-api-team/unity8/unlock-all-modems-on-boot into lp:unity8

[Antti Kaijanmäki]

Unlock all modems on boot.

[Michael Terry (mterry)]

LGTM, works in testing.

review: Approve

[Michael Terry (mterry)]

 * 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.
 TBD

 * Did you make sure that the branch does not contain spurious tags?
 yes

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1366
http://jenkins.qa.ubuntu.com/job/unity8-ci/4659/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5945/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1645
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1755
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1753
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5587/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7197
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7197/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14686

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

review: Needs Fixing (continuous-integration)

[Michael Terry (mterry)]

Ah right, the jenkins job reminds us that you need to fix the test in tests/qmltests/tst_Shell.qml that deals with this. It's marked as expected-fail right now, but needs to be put back to rights.

review: Disapprove

[Michael Terry (mterry)]

Whoops, meant needs fixing.

review: Needs Fixing

[lp:~unity-api-team/unity8/unlock-all-modems-on-boot]

1367. By Antti Kaijanmäki on 2014-10-15

re-enable tst_unlockAllModemsOnBoot

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1367
http://jenkins.qa.ubuntu.com/job/unity8-ci/4661/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5953
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1647
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1757
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1755
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5596
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7205
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7205/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14705

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

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Y
 * Did CI run pass? If not, please explain why.
Bar b0rked AP
 * Did you make sure that the branch does not contain spurious tags?
Y

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1367
http://jenkins.qa.ubuntu.com/job/unity8-ci/4688/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6042
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1674
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1784
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1782
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5675
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7294
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7294/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14838

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

review: Needs Fixing (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2014-10-13 15:42:40 +0000
+++ debian/control	2014-10-15 09:04:22 +0000
@@ -97,7 +97,7 @@
 Recommends: unity-scope-click,
             unity-scope-mediascanner2,
             unity-scope-scopes,
-Breaks: indicator-network (<< 0.5.1),
+Breaks: indicator-network (<< 0.5.1+14.10.20141014),
         ubuntu-touch-session (<< 0.107),
         unity8-greeter (<< 7.89),
 Replaces: ubuntu-touch-session (<< 0.82~),

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2014-10-13 15:41:29 +0000
+++ qml/Shell.qml	2014-10-15 09:04:22 +0000
@@ -547,10 +547,9 @@
                 }
             }
 
-            /* TODO re-enable when the corresponding changes in the service land (LP: #1361074)
             Component.onCompleted: {
                 Connectivity.unlockAllModems()
-            } */
+            }
 
             onUnlocked: greeter.hide()
             onSelected: {

=== modified file 'tests/qmltests/tst_Shell.qml'
--- tests/qmltests/tst_Shell.qml	2014-10-13 15:42:40 +0000
+++ tests/qmltests/tst_Shell.qml	2014-10-15 09:04:22 +0000
@@ -558,8 +558,6 @@
         }
 
         function test_unlockAllModemsOnBoot() {
-            // TODO reenable when service ready (LP: #1361074)
-            expectFail("", "Unlock on boot temporarily disabled");
             tryCompare(unlockAllModemsSpy, "count", 1)
         }