Unity 8

Merge lp:~aacid/unity8/fixTestDashFallback into lp:unity8

  1. fixTestDashFallback
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Michał Sawicz
Approved revision: 1969
Merged at revision: 1972
Proposed branch: lp:~aacid/unity8/fixTestDashFallback
Merge into: lp:unity8
Diff against target: 20 lines (+2/-2)
1 file modified
tests/qmltests/Dash/tst_Card.qml (+2/-2)
To merge this branch: bzr merge lp:~aacid/unity8/fixTestDashFallback
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Michał Sawicz Approve
Review via email: mp+271630@code.launchpad.net

Commit message

Adapt test to code changes

Description of the change

 * Are there any related MPs required for this MP to build/function as expected?
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?
N/A

 * If you changed the UI, has there been a design review?
N/A

To post a comment you must log in.
Revision history for this message
Michał Sawicz (saviq) wrote :

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yup. tests are happy.

 * Did CI run pass? If not, please explain why.
In progress, quite a queue.

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

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

FAILED: Continuous integration, rev:1969
http://jenkins.qa.ubuntu.com/job/unity8-ci/6310/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4247
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/679
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1022
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/340
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/917
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/918
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/549
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/550
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3463
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4244
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4244/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23471
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/400
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/679
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/679/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23472

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

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1969
http://jenkins.qa.ubuntu.com/job/unity8-ci/6336/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4317
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/708
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1048
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/366
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/943
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/944
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/575
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/576
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3519
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4314
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4314/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23590
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/424
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/708
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/708/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23589

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

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/qmltests/Dash/tst_Card.qml'
2--- tests/qmltests/Dash/tst_Card.qml 2015-07-08 09:11:50 +0000
3+++ tests/qmltests/Dash/tst_Card.qml 2015-09-18 10:36:09 +0000
4@@ -473,14 +473,14 @@
5
6 card.cardData["mascot"] = "somethingbroken2";
7 card.cardDataChanged();
8- compare(mascotImage.image.status, Image.Error);
9+ compare(mascotImage.status, Image.Error);
10
11 cardTool.components["mascot"] = {"fallback": Qt.resolvedUrl("artwork/emblem.png")};
12 cardTool.componentsChanged();
13 card.cardData["mascot"] = "somethingbroken2";
14 card.cardDataChanged();
15 waitForRendering(card);
16- tryCompare(mascotImage.image, "status", Image.Ready);
17+ tryCompare(mascotImage, "status", Image.Ready);
18 }
19
20 function test_font_weights_data() {

Subscribers

People subscribed via source and target branches