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

[Albert Astals Cid]

Dash::test_cardIconStyle change compare into tryCompareFunction

On very slow machines (CI or valgrind) the UCProportionalShape is not created immediately so give it some slack

 * 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

 * 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

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2597
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1979/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2598
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1414
    FAILURE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1414/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1414
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2626
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2506
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2506
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2506
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2500
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2500/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2500
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2500/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2500
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2500/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2500
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2500/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2500
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2500/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2500
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2500/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2500
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2500/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2500
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2500/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2500
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2500/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1979/rebuild

review: Needs Fixing (continuous-integration)

[Andrea Cimitan (cimi)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
y
 * Did CI run pass? If not, please explain why.
unrelated

review: Approve

=== modified file 'tests/qmltests/Dash/tst_Dash.qml'
--- tests/qmltests/Dash/tst_Dash.qml	2016-06-21 08:14:56 +0000
+++ tests/qmltests/Dash/tst_Dash.qml	2016-08-18 10:46:51 +0000
@@ -631,18 +631,26 @@
             tryCompare(dashContent.currentScope, "id", "clickscope");
 
             scrollToCategory("dashCategorypredefined");
-            var tile = getCategoryDelegate("predefined", 2);
-            var proportionalShape = findChildsByType(tile, "UCProportionalShape");
-            compare(proportionalShape.length, 1);
+            tryCompareFunction(function() {
+                    var tile = getCategoryDelegate("predefined", 2);
+                    var proportionalShape = findChildsByType(tile, "UCProportionalShape");
+                    return proportionalShape.length === 1;
+                },
+                true
+            );
 
             dash.setCurrentScope("libertine-scope.ubuntu_libertine-scope");
             var dashContent = findChild(dash, "dashContent");
             tryCompare(dashContent.currentScope, "id", "libertine-scope.ubuntu_libertine-scope");
 
             scrollToCategory("dashCategory2");
-            tile = getCategoryDelegate("2", 2);
-            proportionalShape = findChildsByType(tile, "UCProportionalShape");
-            compare(proportionalShape.length, 1);
+            tryCompareFunction(function() {
+                    var tile = getCategoryDelegate("2", 2);
+                    var proportionalShape = findChildsByType(tile, "UCProportionalShape");
+                    return proportionalShape.length === 1;
+                },
+                true
+            );
         }
 
         function test_tempScopeItemXOnResize()