Merge lp://staging/~mterry/unity8/timeout-wizard into lp://staging/unity8
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 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel d'Andrada (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Review via email:
|
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
FAILED: Continuous integration, rev:1636 jenkins. qa.ubuntu. com/job/ unity8- ci/5363/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- vivid-touch/ 1542 jenkins. qa.ubuntu. com/job/ unity-phablet- qmluitests- vivid/527 jenkins. qa.ubuntu. com/job/ unity8- vivid-amd64- ci/528 jenkins. qa.ubuntu. com/job/ unity8- vivid-i386- ci/528 jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- runner- vivid-mako/ 1372 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-armhf/ 1540 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-armhf/ 1540/artifact/ work/output/ *zip*/output. zip s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 18361
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/unity8- ci/5363/ rebuild
http://