Unity 8

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

  1. stabilizeFlakyWizardTest
  2. Merge into trunk
Proposed by Lukáš Tinkl
Status: Merged
Approved by: Michael Terry
Approved revision: 2397
Merged at revision: 2406
Proposed branch: lp:~lukas-kde/unity8/stabilizeFlakyWizardTest
Merge into: lp:unity8
Diff against target: 32 lines (+3/-12)
1 file modified
tests/qmltests/Wizard/tst_Wizard.qml (+3/-12)
To merge this branch: bzr merge lp:~lukas-kde/unity8/stabilizeFlakyWizardTest
Reviewer Review Type Date Requested Status
Unity8 CI Bot continuous-integration Needs Fixing
Michael Terry Approve
Review via email: mp+293999@code.launchpad.net

Commit message

Stabilize flaky wizard tests

Description of the change

Stabilize flaky wizard tests

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

To post a comment you must log in.
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

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)
Revision history for this message
Michael Terry (mterry) wrote :

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 updated
2396. By Lukáš Tinkl

move the animation test into waitForPage()

Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

> 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 updated
2397. By Lukáš Tinkl

... and below the check for the page name

Revision history for this message
Michael Terry (mterry) wrote :

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

review: Approve
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

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)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
144 var pages = findChild(wizard, "wizardPages");144 var pages = findChild(wizard, "wizardPages");
145 var stack = findChild(pages, "pageStack");145 var stack = findChild(pages, "pageStack");
146 // don't simply call tryCompare here, because stack.currentPage will be swapped out itself146 // don't simply call tryCompare here, because stack.currentPage will be swapped out itself
147 tryCompareFunction(function() { return stack.currentPage.objectName; }, name);147 tryCompareFunction(function() { return stack.currentPage.objectName; }, name, 15000);
148 var contentAnimation = findInvisibleChild(stack.currentPage, "contentAnimation");
149 tryCompareFunction(function() { return contentAnimation.running; }, false);
148 tryCompare(stack.currentPage, "opacity", 1.0);150 tryCompare(stack.currentPage, "opacity", 1.0);
149 tryCompare(stack.currentPage, "enabled", true);151 tryCompare(stack.currentPage, "enabled", true);
150 tryCompare(stack.currentPage, "skipValid", true);152 tryCompare(stack.currentPage, "skipValid", true);
@@ -153,17 +155,6 @@
153 return stack.currentPage;155 return stack.currentPage;
154 }156 }
155157
156 function verifyPageIsBlocked(name) {
157 var pages = findChild(wizard, "wizardPages");
158 var stack = findChild(pages, "pageStack");
159 // don't simply call tryCompare here, because stack.currentPage will be swapped out itself
160 tryCompareFunction(function() { return stack.currentPage.objectName; }, name);
161 tryCompare(stack.currentPage, "enabled", false);
162 tryCompare(stack.currentPage, "skipValid", false);
163 waitForRendering(stack.currentPage);
164 return stack.currentPage;
165 }
166
167 function goToPage(name, skipSim, skipLocation, skipReporting) {158 function goToPage(name, skipSim, skipLocation, skipReporting) {
168 if (skipSim === undefined) {159 if (skipSim === undefined) {
169 skipSim = false;160 skipSim = false;

Subscribers

People subscribed via source and target branches