Unity 8

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

  1. fix_card_creator_test
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Michał Sawicz
Approved revision: 2114
Merged at revision: 2132
Proposed branch: lp:~aacid/unity8/fix_card_creator_test
Merge into: lp:unity8
Diff against target: 11 lines (+1/-0)
1 file modified
tests/plugins/Dash/cardcreator/9.res (+1/-0)
To merge this branch: bzr merge lp:~aacid/unity8/fix_card_creator_test
Reviewer Review Type Date Requested Status
Michał Sawicz Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+282187@code.launchpad.net

Commit message

Make the card creator test pass again

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
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:2114
http://jenkins.qa.ubuntu.com/job/unity8-ci/7043/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5986
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/458/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1748
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/451
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1643
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1643
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/450
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/449
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4625
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5997
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5997/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26551
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/206/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/456
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/456/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26552

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/plugins/Dash/cardcreator/9.res'
2--- tests/plugins/Dash/cardcreator/9.res 2015-12-03 16:01:50 +0000
3+++ tests/plugins/Dash/cardcreator/9.res 2016-01-11 15:42:21 +0000
4@@ -3,6 +3,7 @@
5 property var components;
6 property var cardData;
7 property string artShapeStyle: "inset";
8+ property string backgroundShapeStyle: "inset";
9 property real fontScale: 1.0;
10 property var scopeStyle: null;
11 property int titleAlignment: Text.AlignLeft;

Subscribers

People subscribed via source and target branches