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

[Albert Astals Cid]

Fix some qmluitests

 * 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, [more] tests now pass

 * 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

[Michael Zanetti (mzanetti)]

review: Needs Information

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1452
http://jenkins.qa.ubuntu.com/job/unity8-ci/4961/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/329
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/138
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/126
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/126
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/300
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/329
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/329/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16169

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

review: Needs Fixing (continuous-integration)

[Nick Dedekind (nick-dedekind)]

comment attached

review: Needs Fixing

[lp:~aacid/unity8/qmluitestsfix]

1453. By Albert Astals Cid on 2014-11-24

update aux again

1454. By Albert Astals Cid on 2014-11-24

The waitForRendering is enough to get the proper position on valgrind

[Michael Zanetti (mzanetti)]

lgtm now

 * Did you perform an exploratory manual test run of the code change and any related functionality?

yep. all tests passing here.

 * Did CI run pass? If not, please explain why.

I couldn't reproduce the lazyImage one Jenkins still complains about.

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

yes

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1453
http://jenkins.qa.ubuntu.com/job/unity8-ci/4963/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/331
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/140
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/128
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/128
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/303
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/331
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/331/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16173

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

review: Needs Fixing (continuous-integration)

=== modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
--- tests/qmltests/Dash/tst_GenericScopeView.qml	2014-10-21 13:15:51 +0000
+++ tests/qmltests/Dash/tst_GenericScopeView.qml	2014-11-24 14:47:24 +0000
@@ -461,8 +461,8 @@
 
                 var innerHeader = findChild(header, "innerPageHeader");
                 verify(innerHeader, "Could not find the inner header");
-                verify(Qt.colorEqual(innerHeader.textColor, data.foreground),
-                       "Foreground color not equal: %1 != %2".arg(innerHeader.textColor).arg(data.foreground));
+                verify(Qt.colorEqual(innerHeader.config.foregroundColor, data.foreground),
+                       "Foreground color not equal: %1 != %2".arg(innerHeader.config.foregroundColor).arg(data.foreground));
 
                 var background = findChild(header, "headerBackground");
                 verify(background, "Could not find the background");

=== modified file 'tests/qmltests/Dash/tst_PreviewListView.qml'
--- tests/qmltests/Dash/tst_PreviewListView.qml	2014-09-18 05:15:18 +0000
+++ tests/qmltests/Dash/tst_PreviewListView.qml	2014-11-24 14:47:24 +0000
@@ -100,8 +100,8 @@
 
             var innerHeader = findChild(header, "innerPageHeader");
             verify(innerHeader, "Could not find the inner header");
-            verify(Qt.colorEqual(innerHeader.textColor, UbuntuColors.darkGrey),
-                   "Foreground color not equal: %1 != %2".arg(innerHeader.textColor).arg(UbuntuColors.darkGrey));
+            verify(Qt.colorEqual(innerHeader.config.foregroundColor, UbuntuColors.darkGrey),
+                   "Foreground color not equal: %1 != %2".arg(innerHeader.config.foregroundColor).arg(UbuntuColors.darkGrey));
 
             var background = findChild(header, "headerBackground");
             verify(background, "Could not find the background");

=== modified file 'tests/qmltests/Panel/tst_IndicatorsBar.qml'
--- tests/qmltests/Panel/tst_IndicatorsBar.qml	2014-10-17 14:55:35 +0000
+++ tests/qmltests/Panel/tst_IndicatorsBar.qml	2014-11-24 14:47:24 +0000
@@ -136,8 +136,8 @@
             var dataItem = findChild(indicatorsBar, root.originalModelData[data.index]["identifier"] + "-panelItem");
             verify(dataItem !== null);
 
+            waitForRendering(dataItem);
             var mappedPosition = indicatorsBar.mapFromItem(dataItem, dataItem.width/2, dataItem.height/2);
-
             indicatorsBar.selectItemAt(mappedPosition.x);
             indicatorsBar.expanded = true;
             wait_for_expansion_to_settle();