Unity 8

Merge lp://staging/~mterry/unity8/unlock-sim-after-wizard into lp://staging/unity8

  1. unlock-sim-after-wizard
  2. Merge into trunk
Proposed by Michael Terry
Status: Superseded
Proposed branch: lp://staging/~mterry/unity8/unlock-sim-after-wizard
Merge into: lp://staging/unity8
Diff against target: 1124 lines (+395/-400)
6 files modified
qml/Greeter/Greeter.qml (+0/-5)
qml/Shell.qml (+11/-0)
qml/Wizard/Wizard.qml (+1/-1)
tests/qmltests/CMakeLists.txt (+0/-1)
tests/qmltests/tst_Shell.qml (+383/-89)
tests/qmltests/tst_TabletShell.qml (+0/-304)
To merge this branch: bzr merge lp://staging/~mterry/unity8/unlock-sim-after-wizard
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Unity Team Pending
Review via email: mp+251005@code.staging.launchpad.net

This proposal has been superseded by a proposal from 2015-03-03.

Commit message

Only call unlockAllModems once the wizard is done. (LP: #1425161)

Description of the change

Only call unlockAllModems once the wizard is done. (LP: #1425161)

This is only a problem in vivid because in RTM, the shell isn't running when the wizard is.

I never noticed this when testing because I'm a silly American.

== 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

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1636
http://jenkins.qa.ubuntu.com/job/unity8-ci/5362/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1540
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/526
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/527
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/527
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1370
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1538
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1538/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18358

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Daniel d'Andrada (dandrader) wrote :

Would you mind rebasing it on top of lp:~dandrader/unity8/unifyShellTests?

With unifyShellTests, tests functions have to load the shell explicitly using the loadShell(form-factor) helper function, which will be useful for your new test.

Besides, the two conflict anyway, so either of the MPs would have to do that in any case.

lp://staging/~mterry/unity8/unlock-sim-after-wizard updated
1637. By Michael Terry

Merge unifyShellTests

1638. By Michael Terry

Merge from unifyShellTests

1639. By Michael Terry

Add some comments on why we cache the 'active' bool instead of using an alias

Unmerged revisions

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