Merge lp://staging/~mterry/unity8/timezone-name into lp://staging/unity8
Status: | Merged |
---|---|
Approved by: | Lukáš Tinkl |
Approved revision: | 2326 |
Merged at revision: | 2423 |
Proposed branch: | lp://staging/~mterry/unity8/timezone-name |
Merge into: | lp://staging/unity8 |
Diff against target: |
134 lines (+28/-12) 6 files modified
debian/control (+1/-1) qml/Wizard/Pages/50-timezone.qml (+5/-2) tests/mocks/Ubuntu/SystemSettings/TimeDate/CMakeLists.txt (+1/-1) tests/mocks/Ubuntu/SystemSettings/TimeDate/MockTimeDate.qml (+16/-4) tests/mocks/Ubuntu/SystemSettings/TimeDate/qmldir (+1/-1) tests/qmltests/Wizard/tst_Wizard.qml (+4/-3) |
To merge this branch: | bzr merge lp://staging/~mterry/unity8/timezone-name |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Lukáš Tinkl (community) | Approve | ||
Unity8 CI Bot | continuous-integration | Needs Fixing | |
Review via email:
|
Commit message
Use new setTimeZone method to set user-friendly timezone name in the wizard.
Description of the change
Use new setTimeZone method to set user-friendly timezone name in the wizard.
* Are there any related MPs required for this MP to build/function as expected? Please list.
https:/
* 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?
I'm on that team.
* If you changed the UI, has there been a design review?
NA
FAILED: Continuous integration, rev:2326 /unity8- jenkins. ubuntu. com/job/ lp-unity8- ci/934/ /unity8- jenkins. ubuntu. com/job/ test-0- autopkgtest/ label=amd64, release= vivid+overlay, testname= qmluitests. sh/521/ console /unity8- jenkins. ubuntu. com/job/ test-0- autopkgtest/ label=amd64, release= xenial, testname= qmluitests. sh/521/ console /unity8- jenkins. ubuntu. com/job/ test-0- autopkgtest/ label=phone- armhf,release= vivid+overlay, testname= autopilot. sh/521/ console /unity8- jenkins. ubuntu. com/job/ build-0- fetch/1272 /unity8- jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= vivid+overlay/ 1243 /unity8- jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= xenial/ 1243 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 1241 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 1241/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= xenial/ 1241 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= xenial/ 1241/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 1241 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 1241/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= xenial/ 1241 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= xenial/ 1241/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= vivid+overlay/ 1241 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= vivid+overlay/ 1241/artifact/ output/ *zip*/output. zip /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= xenial/ 1241 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= xenial/ 1241/artifact/ output/ *zip*/output. zip
https:/
Executed test runs:
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild: /unity8- jenkins. ubuntu. com/job/ lp-unity8- ci/934/ rebuild
https:/