Merge lp:~zsombi/ubuntu-ui-toolkit/fixListItem56 into lp:ubuntu-ui-toolkit/staging
- fixListItem56
- Merge into staging
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Zsombor Egri | ||||
Approved revision: | 2134 | ||||
Merged at revision: | 2138 | ||||
Proposed branch: | lp:~zsombi/ubuntu-ui-toolkit/fixListItem56 | ||||
Merge into: | lp:ubuntu-ui-toolkit/staging | ||||
Diff against target: |
25 lines (+2/-2) 2 files modified
tests/unit/visual/tst_listitem.12.qml (+1/-1) tests/unit/visual/tst_listitem.13.qml (+1/-1) |
||||
To merge this branch: | bzr merge lp:~zsombi/ubuntu-ui-toolkit/fixListItem56 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
ubuntu-sdk-build-bot | continuous-integration | Approve | |
Cris Dywan | Approve | ||
Review via email: mp+307818@code.launchpad.net |
Commit message
Fix color used to test ListItem.
Description of the change
Fix color used to test ListItem.
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2134
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2134
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2134
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2134
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2134
https:/
Executed test runs:
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/
Cris Dywan (kalikiana) wrote : | # |
Straight-forward, makes sense. Thanks for fixing this test case!
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Continuous integration, rev:2134
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2134
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2134
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2134
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2134
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
FAILED: Autolanding.
More details in the following jenkins job:
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
None: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2134
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2134
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2134
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2134
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote : | # |
PASSED: Continuous integration, rev:2134
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/
Preview Diff
1 | === renamed file 'tests/unit/visual/FIXME-QT56_listitem.12.qml' => 'tests/unit/visual/tst_listitem.12.qml' | |||
2 | --- tests/unit/visual/FIXME-QT56_listitem.12.qml 2016-09-16 11:03:43 +0000 | |||
3 | +++ tests/unit/visual/tst_listitem.12.qml 2016-10-06 11:27:22 +0000 | |||
4 | @@ -247,7 +247,7 @@ | |||
5 | 247 | function test_0_defaults() { | 247 | function test_0_defaults() { |
6 | 248 | verify(defaults.contentItem !== null, "Defaults is null"); | 248 | verify(defaults.contentItem !== null, "Defaults is null"); |
7 | 249 | compare(defaults.color.toString(), Qt.rgba(0.0, 0.0, 0.0, 0.0).toString(), "Transparent by default"); | 249 | compare(defaults.color.toString(), Qt.rgba(0.0, 0.0, 0.0, 0.0).toString(), "Transparent by default"); |
9 | 250 | compare(defaults.highlightColor, theme.palette.selected.background, "theme.palette.selected.background color by default") | 250 | compare(defaults.highlightColor, theme.palette.highlighted.background, "theme.palette.selected.background color by default") |
10 | 251 | compare(defaults.highlighted, false, "Not highlighted by default"); | 251 | compare(defaults.highlighted, false, "Not highlighted by default"); |
11 | 252 | compare(defaults.divider.visible, true, "divider is visible by default"); | 252 | compare(defaults.divider.visible, true, "divider is visible by default"); |
12 | 253 | compare(defaults.divider.anchors.leftMargin, 0, "divider's left margin is 0"); | 253 | compare(defaults.divider.anchors.leftMargin, 0, "divider's left margin is 0"); |
13 | 254 | 254 | ||
14 | === renamed file 'tests/unit/visual/FIXME-QT56_listitem.13.qml' => 'tests/unit/visual/tst_listitem.13.qml' | |||
15 | --- tests/unit/visual/FIXME-QT56_listitem.13.qml 2016-09-16 11:03:43 +0000 | |||
16 | +++ tests/unit/visual/tst_listitem.13.qml 2016-10-06 11:27:22 +0000 | |||
17 | @@ -247,7 +247,7 @@ | |||
18 | 247 | function test_0_defaults() { | 247 | function test_0_defaults() { |
19 | 248 | verify(defaults.contentItem !== null, "Defaults is null"); | 248 | verify(defaults.contentItem !== null, "Defaults is null"); |
20 | 249 | compare(defaults.color.toString(), Qt.rgba(0.0, 0.0, 0.0, 0.0).toString(), "Transparent by default"); | 249 | compare(defaults.color.toString(), Qt.rgba(0.0, 0.0, 0.0, 0.0).toString(), "Transparent by default"); |
22 | 250 | compare(defaults.highlightColor, theme.palette.selected.background, "theme.palette.selected.background color by default") | 250 | compare(defaults.highlightColor, theme.palette.highlighted.background, "theme.palette.selected.background color by default") |
23 | 251 | compare(defaults.highlighted, false, "Not highlighted by default"); | 251 | compare(defaults.highlighted, false, "Not highlighted by default"); |
24 | 252 | compare(defaults.divider.visible, true, "divider is visible by default"); | 252 | compare(defaults.divider.visible, true, "divider is visible by default"); |
25 | 253 | compare(defaults.divider.anchors.leftMargin, 0, "divider's left margin is 0"); | 253 | compare(defaults.divider.anchors.leftMargin, 0, "divider's left margin is 0"); |
PASSED: Continuous integration, rev:2134 /jenkins. ubuntu. com/ubuntu- sdk/job/ ubuntu- ui-toolkit- ci-i386- gles-stable/ 1277/ /jenkins. ubuntu. com/ubuntu- sdk/job/ generic- update- mp/6968/ console
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild: /jenkins. ubuntu. com/ubuntu- sdk/job/ ubuntu- ui-toolkit- ci-i386- gles-stable/ 1277/rebuild
https:/