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

[Albert Astals Cid]

Convert while into tryCompareFunction

The while should eventually always finish but we have seen cases in which the tests run for 3 hours in GenericScopeView
so it may be here. Turn it into a tryCompareFunction to see if that's the case

 * 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

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

FAILED: Continuous integration, rev:2137
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/129/
Executed test runs:

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2137
http://jenkins.qa.ubuntu.com/job/unity8-ci/7096/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6063
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/511/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1801
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/504
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1696
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1696
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/503
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/502
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4683
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6074
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6074/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26762
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/250/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/509
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/509/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26763

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

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

 * 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.
Britney was happy with it, I've started a CI run here: https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/198/
 * Did you make sure that the branch does not contain spurious tags?
Y

review: Approve

=== modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
--- tests/qmltests/Dash/tst_GenericScopeView.qml	2015-12-16 14:35:14 +0000
+++ tests/qmltests/Dash/tst_GenericScopeView.qml	2016-01-18 22:52:08 +0000
@@ -107,11 +107,12 @@
             {
                 var categoryListView = findChild(genericScopeView, "categoryListView");
                 waitForRendering(categoryListView);
-                while (!categoryListView.atYEnd) {
-                    mouseFlick(genericScopeView, genericScopeView.width/2, genericScopeView.height - units.gu(8),
-                               genericScopeView.width/2, genericScopeView.y)
-                    tryCompare(categoryListView, "moving", false);
-                }
+                tryCompareFunction(function() {
+                        mouseFlick(genericScopeView, genericScopeView.width/2, genericScopeView.height - units.gu(8),
+                                   genericScopeView.width/2, genericScopeView.y)
+                        tryCompare(categoryListView, "moving", false);
+                        return categoryListView.atYEnd;
+                    }, true);
             }
 
             function test_isActive() {