Merge lp:~lukas-kde/unity8/stabilizeFlakyWizardTest into lp:unity8

[Lukáš Tinkl]

Stabilize flaky wizard tests

Stabilize flaky wizard tests

Increase the timeout while waiting for a page to load a bit and make sure animations are settled.

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

FAILED: Continuous integration, rev:2395
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1141/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/695
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/695
    FAILURE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=autopilot.sh/695/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1533
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1493
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1493
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1493
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1493/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1493
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1493/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1493
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1493/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1493
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1493/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1493
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1493/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1493
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1493/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Michael Terry (mterry)]

Might you want to move

+ var contentAnimation = findInvisibleChild(page, "contentAnimation");
+ tryCompareFunction(function() { return contentAnimation.running; }, false);

directly into the waitForPage() method so all tests benefit from the fix?

review: Needs Fixing

[lp:~lukas-kde/unity8/stabilizeFlakyWizardTest]

2396. By Lukáš Tinkl on 2016-05-06

move the animation test into waitForPage()

[Lukáš Tinkl (lukas-kde)]

> Might you want to move
>
> + var contentAnimation = findInvisibleChild(page,
> "contentAnimation");
> + tryCompareFunction(function() { return contentAnimation.running;
> }, false);
>
> directly into the waitForPage() method so all tests benefit from the fix?

Good idea, done

[lp:~lukas-kde/unity8/stabilizeFlakyWizardTest]

2397. By Lukáš Tinkl on 2016-05-06

... and below the check for the page name

[Michael Terry (mterry)]

OK looks good now. Could just use tryCompare instead of tryCompareFunction, but no biggie.

review: Approve

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

FAILED: Continuous integration, rev:2396
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1142/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/696
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/696
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=autopilot.sh/696
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1534
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1494
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1494
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1494
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1494/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1494
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1494/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1494
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1494/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1494
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1494/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1494
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1494/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1494
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1494/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

=== modified file 'tests/qmltests/Wizard/tst_Wizard.qml'
--- tests/qmltests/Wizard/tst_Wizard.qml	2016-04-27 15:01:10 +0000
+++ tests/qmltests/Wizard/tst_Wizard.qml	2016-05-06 13:51:58 +0000
@@ -144,7 +144,9 @@
             var pages = findChild(wizard, "wizardPages");
             var stack = findChild(pages, "pageStack");
             // don't simply call tryCompare here, because stack.currentPage will be swapped out itself
-            tryCompareFunction(function() { return stack.currentPage.objectName; }, name);
+            tryCompareFunction(function() { return stack.currentPage.objectName; }, name, 15000);
+            var contentAnimation = findInvisibleChild(stack.currentPage, "contentAnimation");
+            tryCompareFunction(function() { return contentAnimation.running; }, false);
             tryCompare(stack.currentPage, "opacity", 1.0);
             tryCompare(stack.currentPage, "enabled", true);
             tryCompare(stack.currentPage, "skipValid", true);
@@ -153,17 +155,6 @@
             return stack.currentPage;
         }
 
-        function verifyPageIsBlocked(name) {
-            var pages = findChild(wizard, "wizardPages");
-            var stack = findChild(pages, "pageStack");
-            // don't simply call tryCompare here, because stack.currentPage will be swapped out itself
-            tryCompareFunction(function() { return stack.currentPage.objectName; }, name);
-            tryCompare(stack.currentPage, "enabled", false);
-            tryCompare(stack.currentPage, "skipValid", false);
-            waitForRendering(stack.currentPage);
-            return stack.currentPage;
-        }
-
         function goToPage(name, skipSim, skipLocation, skipReporting) {
             if (skipSim === undefined) {
                 skipSim = false;