Unity 8

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

stabilizeFlakyWizardTest
Merge into trunk

Proposed by Lukáš Tinkl on 2016-05-06

Status:

Merged

Approved by:

Michael Terry on 2016-05-06

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

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Needs Fixing on 2016-05-06
Michael Terry		2016-05-06	Approve on 2016-05-06
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.

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-05-06:

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) wrote on 2016-05-06:

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 on 2016-05-06

2396. By Lukáš Tinkl on 2016-05-06: move the animation test into waitForPage()

Lukáš Tinkl (lukas-kde) wrote on 2016-05-06:

> 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 on 2016-05-06

2397. By Lukáš Tinkl on 2016-05-06: ... and below the check for the page name

Michael Terry (mterry) wrote on 2016-05-06:

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

review: Approve

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-05-06:

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

Subscribers

People subscribed via source and target branches

to all changes:

Lukáš Tinkl

Mohammad Rakibul Hasan

Unity Team

 === 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;