Unity 8

Merge lp://staging/~mterry/unity8/timeout-wizard into lp://staging/unity8

  1. timeout-wizard
  2. Merge into trunk
Proposed by Michael Terry
Status: Merged
Approved by: Daniel d'Andrada
Approved revision: 1637
Merged at revision: 1671
Proposed branch: lp://staging/~mterry/unity8/timeout-wizard
Merge into: lp://staging/unity8
Diff against target: 76 lines (+32/-2)
2 files modified
qml/Wizard/Pages.qml (+14/-1)
tests/qmltests/Wizard/tst_Wizard.qml (+18/-1)
To merge this branch: bzr merge lp://staging/~mterry/unity8/timeout-wizard
Reviewer Review Type Date Requested Status
Daniel d'Andrada (community) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+251020@code.staging.launchpad.net

Commit message

Don't let the wizard sit indefinitely, waiting for a wizard page to finish preparing itself.

If a wizard page has a bug, we don't want to let it block the user.

Description of the change

Don't let the wizard sit indefinitely, waiting for a wizard page to finish preparing itself. If a wizard page has a bug, we don't want to let it block the user.

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

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

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/5363/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1542
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/527
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/528
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/528
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1372
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1540
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1540/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18361

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

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

Please update the copyright year of qml/Wizard/Pages.qml and tests/qmltests/Wizard/tst_Wizard.qml

lp://staging/~mterry/unity8/timeout-wizard updated
1637. By Michael Terry

Update copyright years

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

> Please update the copyright year of qml/Wizard/Pages.qml
> and tests/qmltests/Wizard/tst_Wizard.qml

Done.

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

FAILED: Continuous integration, rev:1637
http://jenkins.qa.ubuntu.com/job/unity8-ci/5385/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1628
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/549
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/550
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/550
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1443
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1626
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1626/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18511

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

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

* 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.
No, unrelated autopilot failures

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

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