Merge lp:~cimi/unity8/fix-genericscopeview-flakytest into lp:unity8

[Andrea Cimitan]

rework GenericScopeView PullToRefresh test

 * Are there any related MPs required for this MP to build/function as expected? Please list.
n
 * Did you perform an exploratory manual test run of your code change and any related functionality?
y
 * 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

[lp:~cimi/unity8/fix-genericscopeview-flakytest]

2598. By Andrea Cimitan on 2016-08-19

cosmetics

[Albert Astals Cid (aacid)]

Ok, let's see if that helps

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

 * Did CI run pass? If not, please explain why.
Waiting before top approval

review: Approve

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

FAILED: Continuous integration, rev:2597
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1986/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2605
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1420
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1420
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1420
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2633
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2512
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2512
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2512
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2506
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2506/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2506
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2506/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2506
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2506/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2506
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2506/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2506
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2506/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2506
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2506/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2506
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2506/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2506
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2506/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2506
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2506/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

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

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

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

review: Needs Fixing (continuous-integration)

=== modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
--- tests/qmltests/Dash/tst_GenericScopeView.qml	2016-06-29 14:45:18 +0000
+++ tests/qmltests/Dash/tst_GenericScopeView.qml	2016-08-19 11:40:39 +0000
@@ -570,53 +570,40 @@
                 genericScopeView.scope = !genericScopeView.scope;
             }
 
-            function test_pullToRefresh() {
-                waitForRendering(genericScopeView)
-
-                mouseFlick(genericScopeView,
-                           genericScopeView.width/2, units.gu(10),
-                           genericScopeView.width/2, units.gu(80),
-                           true, false)
-
-                var pullToRefresh = findChild(genericScopeView, "pullToRefresh")
-                tryCompare(pullToRefresh, "releaseToRefresh", true)
-
-                spy.target = genericScopeView.scope
-                spy.signalName = "refreshed"
-
-                mouseRelease(genericScopeView)
-                tryCompare(pullToRefresh, "releaseToRefresh", false)
-
-                spy.wait()
-                compare(spy.count, 1)
-
-                // test short swipe doesn't refresh on tall window
-                mouseFlick(genericScopeView,
-                           genericScopeView.width/2, units.gu(10),
-                           genericScopeView.width/2, units.gu(20),
-                           true, false)
-                mouseRelease(genericScopeView)
-                compare(spy.count, 1)
-
-                // resize window, repeat the test
-                var initialHeight = shell.height
-                shell.height = units.gu(30)
-                waitForRendering(shell)
-                mouseFlick(genericScopeView,
-                           genericScopeView.width/2, units.gu(10),
-                           genericScopeView.width/2, units.gu(20),
-                           true, false)
-
-                tryCompare(pullToRefresh, "releaseToRefresh", true)
-
-                mouseRelease(genericScopeView)
-                tryCompare(pullToRefresh, "releaseToRefresh", false)
-
-                spy.wait()
-                compare(spy.count, 2)
-
-                shell.height = initialHeight
-                waitForRendering(shell)
+            function test_pullToRefresh_data() {
+                return [
+                    { tag: "Tall window long flick", shellHeight: units.gu(100), flickLength: units.gu(70), refresh: true },
+                    { tag: "Tall window short flick", shellHeight: units.gu(100), flickLength: units.gu(25), refresh: false },
+                    { tag: "Short window", shellHeight: units.gu(30), flickLength: units.gu(25), refresh: true }
+                ];
+            }
+
+            function test_pullToRefresh(data) {
+                var initialHeight = shell.height;
+                shell.height = data.shellHeight;
+                waitForRendering(shell);
+
+                mouseFlick(genericScopeView,
+                           genericScopeView.width/2, units.gu(6),
+                           genericScopeView.width/2, units.gu(6) + data.flickLength,
+                           true, false);
+
+                var pullToRefresh = findChild(genericScopeView, "pullToRefresh");
+                tryCompare(pullToRefresh, "releaseToRefresh", data.refresh);
+
+                spy.target = genericScopeView.scope;
+                spy.signalName = "refreshed";
+
+                mouseRelease(genericScopeView);
+                tryCompare(pullToRefresh, "releaseToRefresh", false);
+
+                if (data.refresh) {
+                    spy.wait();
+                    compare(spy.count, 1);
+                }
+
+                shell.height = initialHeight;
+                waitForRendering(shell);
             }
 
             function test_item_noninteractive() {