Merge lp:~jonas-drange/ubuntu-system-settings/fix-broken-global into lp:ubuntu-system-settings

Proposed by Jonas G. Drange on 2016-08-24
Status: Merged
Approved by: Ken VanDine on 2016-08-25
Approved revision: 1698
Merged at revision: 1708
Proposed branch: lp:~jonas-drange/ubuntu-system-settings/fix-broken-global
Merge into: lp:ubuntu-system-settings
Diff against target: 34 lines (+14/-0)
2 files modified
plugins/system-update/Global.qml (+3/-0)
tests/plugins/system-update/tst_systemupdate_global.qml (+11/-0)
To merge this branch: bzr merge lp:~jonas-drange/ubuntu-system-settings/fix-broken-global
Reviewer Review Type Date Requested Status
Ken VanDine 2016-08-24 Approve on 2016-08-25
system-apps-ci-bot continuous-integration Needs Fixing on 2016-08-24
Review via email: mp+303790@code.launchpad.net

Commit message

fix cases where check label is really long (via translations)

To post a comment you must log in.

FAILED: Continuous integration, rev:1698
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/125/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1284/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1284
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/1150
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/1150
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/1150
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1133/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1133/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1133
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1133/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1133
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1133/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1133
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1133/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1133
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1133/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1133
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1133/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1133
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1133/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1133
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1133/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/125/rebuild

review: Needs Fixing (continuous-integration)
Ken VanDine (ken-vandine) wrote :

Looks good

review: Approve
Jonas G. Drange (jonas-drange) wrote :

Test failure here was click client, which is being addressed in lp:~jonas-drange/ubuntu-system-settings/harden-clickclient-test

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/system-update/Global.qml'
2--- plugins/system-update/Global.qml 2016-08-11 13:05:45 +0000
3+++ plugins/system-update/Global.qml 2016-08-24 09:56:06 +0000
4@@ -78,6 +78,9 @@
5 }
6
7 Label {
8+ objectName: "checkLabel"
9+ Layout.fillWidth: true
10+ elide: Text.ElideRight
11 text: i18n.tr("Checking for updates…")
12 }
13
14
15=== modified file 'tests/plugins/system-update/tst_systemupdate_global.qml'
16--- tests/plugins/system-update/tst_systemupdate_global.qml 2016-08-11 13:05:45 +0000
17+++ tests/plugins/system-update/tst_systemupdate_global.qml 2016-08-24 09:56:06 +0000
18@@ -293,5 +293,16 @@
19 if (data.batchMode) instance.batchMode = data.batchMode
20 compare(instance.hidden, data.hidden, "had wrong visibility");
21 }
22+
23+ function test_longCheckLabel() {
24+ // Prerequisites for the global area to be visible.
25+ instance.status = true;
26+ instance.online = true;
27+ instance.updatesCount = true;
28+
29+ var checkLabel = findChild(instance, "checkLabel");
30+ checkLabel.text = "Really really really really really long translated string";
31+ verify(checkLabel.width < checkLabel.implicitWidth, "global area was too wide");
32+ }
33 }
34 }

Subscribers

People subscribed via source and target branches