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

[Albert Astals Cid]

Improve findChild calls inside tryCompareFunction.

findChild has a timeout retry since a while ago. This means that if we have a findChild inside a tryCompareFunction the retries multiply and it takes around 30 minutes for the tryCompareFunction to fail if the findChild is failing, so what we do is set the timeout of findChild to 0.

In other cases we just had a tryCompareFunction that made sure the findChild after it would succeed, since now findChild has a retry mechanism we can just remove that tryCompareFunction altogether.

* 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

 * 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)]

PASSED: Continuous integration, rev:2602
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2058/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2704
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1488
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1488
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1488
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2732
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2605
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2605
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2605
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2598
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2598/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2598
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2598/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2598
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2598/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2598
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2598/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2598
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2598/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2598
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2598/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2598
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2598/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2598
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2598/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2598
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2598/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

OK then. Thanks!

review: Approve

=== modified file 'tests/qmltests/Components/tst_Carousel.qml'
--- tests/qmltests/Components/tst_Carousel.qml	2015-07-15 15:07:19 +0000
+++ tests/qmltests/Components/tst_Carousel.qml	2016-08-30 09:46:12 +0000
@@ -268,7 +268,6 @@
 
         function test_activate() {
             var carouselList = findChild(carousel, "listView");
-            tryCompareFunction(function() { return findChild(carouselList, "carouselDelegate3") ? true : false; }, true);
             var carouselItem = findChild(carousel, "carouselDelegate3")
             verify(carouselItem, "Could not find delegate");
 
 
=== modified file 'tests/qmltests/Components/tst_Lockscreen.qml'
--- tests/qmltests/Components/tst_Lockscreen.qml	2016-05-26 20:59:30 +0000
+++ tests/qmltests/Components/tst_Lockscreen.qml	2016-08-30 09:46:12 +0000
@@ -422,7 +422,6 @@
         function test_infoPopup() {
             verify(findChild(root, "infoPopup") === null);
             lockscreen.showInfoPopup("foo", "bar");
-            tryCompareFunction(function() { return findChild(root, "infoPopup") !== null}, true);
 
             var infoPopup = findChild(root, "infoPopup");
             compare(infoPopup.title, "foo");
@@ -434,7 +433,7 @@
             var okButton = findChild(root, "infoPopupOkButton");
             mouseClick(okButton);
 
-            tryCompareFunction(function() { return findChild(root, "infoPopup") === null}, true);
+            tryCompareFunction(function() { return findChild(root, "infoPopup", 0 /* timeout */) === null}, true);
 
             tryCompare(signalSpy, "count", 1);
         }
 
=== modified file 'tests/qmltests/Dash/Previews/tst_Preview.qml'
--- tests/qmltests/Dash/Previews/tst_Preview.qml	2016-05-02 08:15:14 +0000
+++ tests/qmltests/Dash/Previews/tst_Preview.qml	2016-08-30 09:46:12 +0000
@@ -78,7 +78,6 @@
 
         function test_containOnFocus() {
             waitForRendering(preview);
-            tryCompareFunction(function () { return findChild(preview, "widget-10") != null }, true);
             var widget = findChild(preview, "widget-10");
 
             var bottomLeft = preview.mapFromItem(widget, 0, widget.height);
@@ -94,7 +93,6 @@
 
         function test_containOnGrow() {
             waitForRendering(preview);
-            tryCompareFunction(function () { return findChild(preview, "widget-13") != null }, true);
             var widget = findChild(preview, "widget-13");
 
             var bottomLeft = preview.mapFromItem(widget, 0, widget.height);
 
=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewHeader.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewHeader.qml	2016-03-10 22:39:24 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewHeader.qml	2016-08-30 09:46:12 +0000
@@ -116,7 +116,6 @@
 
             tryCompare(testCase.mascotShapeLoader, "visible", data.loaderVisible);
             if (data.loaderVisible) {
-                tryCompareFunction(function() { return findChild(previewHeader, "mascotShape") != null }, true);
                 var mascot = findChild(previewHeader, "mascotShape")
                 tryCompare(mascot, "visible", data.visible);
             }
@@ -165,20 +164,17 @@
 
         function test_fallback() {
             previewHeader.widgetData = brokenheaderjson;
-            tryCompareFunction(function() { return findChild(previewHeader, "mascotShape") != null }, true);
             var mascot = findChild(previewHeader, "mascotShape");
             compare(mascot.visible, false);
 
             previewHeader.widgetData = {};
             previewHeader.widgetData = fallbackheaderjson;
-            tryCompareFunction(function() { return findChild(previewHeader, "mascotShape") != null }, true);
             var mascot = findChild(previewHeader, "mascotShape");
             tryCompare(mascot, "visible", true);
             tryCompare(mascot.source, "status", Image.Ready);
 
             previewHeader.widgetData = {};
             previewHeader.widgetData = emptyfallbackheaderjson;
-            tryCompareFunction(function() { return findChild(previewHeader, "mascotShape") != null }, true);
             var mascot = findChild(previewHeader, "mascotShape");
             tryCompare(mascot, "visible", true);
             tryCompare(mascot.source, "status", Image.Ready);
 
=== modified file 'tests/qmltests/Dash/tst_CardTool.qml'
--- tests/qmltests/Dash/tst_CardTool.qml	2016-05-26 14:40:48 +0000
+++ tests/qmltests/Dash/tst_CardTool.qml	2016-08-30 09:46:12 +0000
@@ -339,22 +339,22 @@
         function test_card_title_alignment(data) {
             selector.selectedIndex = data.index;
 
-            tryCompareFunction(function() { return findChild(internalCard, "titleLabel").horizontalAlignment == Text.AlignLeft; }, true);
+            tryCompareFunction(function() { return findChild(internalCard, "titleLabel", 0 /* timeout */).horizontalAlignment == Text.AlignLeft; }, true);
 
             cardTool.components['title'] = { "field": "title", "align": "center" };
             cardTool.componentsChanged();
 
-            tryCompareFunction(function() { return findChild(internalCard, "titleLabel").horizontalAlignment == data.value; }, true);
+            tryCompareFunction(function() { return findChild(internalCard, "titleLabel", 0 /* timeout */).horizontalAlignment == data.value; }, true);
 
             cardTool.components['title'] = { "field": "title" };
             cardTool.componentsChanged();
 
-            tryCompareFunction(function() { return findChild(internalCard, "titleLabel").horizontalAlignment == data.value; }, true);
+            tryCompareFunction(function() { return findChild(internalCard, "titleLabel", 0 /* timeout */).horizontalAlignment == data.value; }, true);
 
             cardTool.components['title'] = { "field": "title", "align": "left" };
             cardTool.componentsChanged();
 
-            tryCompareFunction(function() { return findChild(internalCard, "titleLabel").horizontalAlignment == Text.AlignLeft; }, true);
+            tryCompareFunction(function() { return findChild(internalCard, "titleLabel", 0 /* timeout */).horizontalAlignment == Text.AlignLeft; }, true);
         }
 
         function test_categoryLayout_data() {
 
=== modified file 'tests/qmltests/Dash/tst_Dash.qml'
--- tests/qmltests/Dash/tst_Dash.qml	2016-06-21 08:14:56 +0000
+++ tests/qmltests/Dash/tst_Dash.qml	2016-08-30 09:46:12 +0000
@@ -76,7 +76,7 @@
             var genericScopeView = dashContentList.currentItem;
             var categoryListView = findChild(genericScopeView, "categoryListView");
             tryCompareFunction(function() {
-                var category = findChild(genericScopeView, categoryName);
+                var category = findChild(genericScopeView, categoryName, 0 /* timeout */);
                 if (category && category.y > 0 && category.y < genericScopeView.height) return true;
                 touchFlick(genericScopeView, genericScopeView.width/2, units.gu(20),
                             genericScopeView.width/2, genericScopeView.y)
@@ -84,7 +84,7 @@
                 return false;
             }, true);
 
-            tryCompareFunction(function() { return findChild(genericScopeView, "delegate0") !== null; }, true);
+            tryCompareFunction(function() { return findChild(genericScopeView, "delegate0", 0 /* timeout */) !== null; }, true);
             return findChild(genericScopeView, categoryName);
         }
 
@@ -94,9 +94,9 @@
             if (category === undefined) category = 0;
             if (delegate === undefined) delegate = 0;
             tryCompareFunction(function() {
-                                    var cardGrid = findChild(genericScopeView, "dashCategory"+category);
+                                    var cardGrid = findChild(genericScopeView, "dashCategory"+category, 0 /* timeout */);
                                     if (cardGrid != null) {
-                                        var tile = findChild(cardGrid, "delegate"+delegate);
+                                        var tile = findChild(cardGrid, "delegate"+delegate, 0 /* timeout */);
                                         return tile != null;
                                     }
                                     return false;
@@ -473,9 +473,9 @@
             compare(dashContentList.currentItem.scopeId, "MockScope1");
 
             tryCompareFunction(function() {
-                var cardGrid = findChild(dashContentList, "dashCategory0");
+                var cardGrid = findChild(dashContentList, "dashCategory0", 0 /* timeout */);
                 if (cardGrid != null) {
-                    var tile = findChild(cardGrid, "delegate0");
+                    var tile = findChild(cardGrid, "delegate0", 0 /* timeout */);
                     return tile != null;
                 }
                 return false;
@@ -520,9 +520,9 @@
             var categoryListView = findChild(dashTempScopeItem, "categoryListView");
             categoryListView.positionAtBeginning();
             tryCompareFunction(function() {
-                                    var cardGrid = findChild(dashTempScopeItem, "dashCategory0");
+                                    var cardGrid = findChild(dashTempScopeItem, "dashCategory0", 0 /* timeout */);
                                     if (cardGrid != null) {
-                                        var tile = findChild(cardGrid, "delegate0");
+                                        var tile = findChild(cardGrid, "delegate0", 0 /* timeout */);
                                         return tile != null;
                                     }
                                     return false;
 
=== modified file 'tests/qmltests/Dash/tst_DashContent.qml'
--- tests/qmltests/Dash/tst_DashContent.qml	2016-08-03 15:51:32 +0000
+++ tests/qmltests/Dash/tst_DashContent.qml	2016-08-30 09:46:12 +0000
@@ -261,11 +261,11 @@
 
         function test_carouselAspectRatio() {
             tryCompareFunction(function() {
-                                    var scope = findChild(dashContent, "scopeLoader0");
+                                    var scope = findChild(dashContent, "scopeLoader0", 0 /* timeout */);
                                     if (scope != null) {
-                                        var dashCategory1 = findChild(scope, "dashCategory1");
+                                        var dashCategory1 = findChild(scope, "dashCategory1", 0 /* timeout */);
                                         if (dashCategory1 != null) {
-                                            var tile = findChild(dashCategory1, "carouselDelegate1");
+                                            var tile = findChild(dashCategory1, "carouselDelegate1", 0 /* timeout */);
                                             return tile != null;
                                         }
                                     }
@@ -282,7 +282,6 @@
 
         function test_mainNavigation() {
             var dashContentList = findChild(dashContent, "dashContentList");
-            tryCompareFunction(function() { return findChild(dashContentList.currentItem, "dashNavigation") != null; }, true);
             var dashNavigation = findChild(dashContentList.currentItem, "dashNavigation");
             var peExtraPanel = findChild(dashContentList.currentItem, "peExtraPanel");
             var searchButton = findChild(dashContentList.currentItem, "search_button");
@@ -405,7 +404,6 @@
 
         function goToSecondLevel() {
             var dashContentList = findChild(dashContent, "dashContentList");
-            tryCompareFunction(function() { return findChild(dashContentList.currentItem, "dashNavigation") != null; }, true);
             var dashNavigation = findChild(dashContentList.currentItem, "dashNavigation");
             var peExtraPanel = findChild(dashContentList.currentItem, "peExtraPanel");
             var searchButton = findChild(dashContentList.currentItem, "search_button");
@@ -580,7 +578,7 @@
 
         function test_primaryFilter() {
             var dashContentList = findChild(dashContent, "dashContentList");
-            tryCompareFunction(function() { return findChild(dashContentList.currentItem, "dashNavigation") != null; }, true);
+            tryCompareFunction(function() { return findChild(dashContentList.currentItem, "dashNavigation", 0 /* timeout */) != null; }, true);
             dashContentList.currentItem.item.scope.setHasNavigation(false);
             var peExtraPanel = findChild(dashContentList.currentItem, "peExtraPanel");
             var searchButton = findChild(dashContentList.currentItem, "search_button");
@@ -589,7 +587,7 @@
             mouseClick(searchButton);
             tryCompare(peExtraPanel, "visible", true);
 
-            tryCompareFunction(function() { return findChild(peExtraPanel, "OSF3") != null; }, true);
+            tryCompareFunction(function() { return findChild(peExtraPanel, "OSF3", 0 /* timeout */) != null; }, true);
         }
 
         function test_searchHint() {
 
=== 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-30 09:46:12 +0000
@@ -92,7 +92,7 @@
             function scrollToCategory(categoryName) {
                 var categoryListView = findChild(genericScopeView, "categoryListView");
                 tryCompareFunction(function() {
-                    var category = findChild(genericScopeView, categoryName);
+                    var category = findChild(genericScopeView, categoryName, 0 /* timeout */);
                     if (category && category.y > 0 && category.y < genericScopeView.height) return true;
                     touchFlick(genericScopeView, genericScopeView.width/2, units.gu(20),
                                genericScopeView.width/2, genericScopeView.y)
@@ -100,7 +100,7 @@
                     return false;
                 }, true);
 
-                tryCompareFunction(function() { return findChild(genericScopeView, "delegate0") !== null; }, true);
+                tryCompareFunction(function() { return findChild(genericScopeView, "delegate0", 0 /* timeout */) !== null; }, true);
                 return findChild(genericScopeView, categoryName);
             }
 
@@ -163,7 +163,7 @@
             }
 
             function test_expand_collapse() {
-                tryCompareFunction(function() { return findChild(genericScopeView, "dashSectionHeader0") != null; }, true);
+                tryCompareFunction(function() { return findChild(genericScopeView, "dashSectionHeader0", 0 /* timeout */) != null; }, true);
 
                 var category = findChild(genericScopeView, "dashCategory0")
                 var seeAll = findChild(category, "seeAll")
@@ -184,7 +184,7 @@
 
             function test_expand_expand_collapse() {
                 // wait for the item to be there
-                tryCompareFunction(function() { return findChild(genericScopeView, "dashSectionHeader2") != null; }, true);
+                tryCompareFunction(function() { return findChild(genericScopeView, "dashSectionHeader2", 0 /* timeout */) != null; }, true);
 
                 var categoryListView = findChild(genericScopeView, "categoryListView");
                 categoryListView.contentY = categoryListView.height;
@@ -212,7 +212,6 @@
             }
 
             function test_headerLink() {
-                tryCompareFunction(function() { return findChild(genericScopeView, "dashSectionHeader1") != null; }, true);
                 var header = findChild(genericScopeView, "dashSectionHeader1");
 
                 spy.target = genericScopeView.scope;
@@ -231,7 +230,7 @@
                 categoryListView.contentY = categoryListView.height * 2;
 
                 // wait for the item to be there
-                tryCompareFunction(function() { return findChild(genericScopeView, "dashSectionHeader4") != null; }, true);
+                tryCompareFunction(function() { return findChild(genericScopeView, "dashSectionHeader4", 0 /* timeout */) != null; }, true);
 
                 var categoryView = findChild(genericScopeView, "dashCategory4");
                 verify(categoryView, "Can't find the category view.");
@@ -243,7 +242,6 @@
             }
 
             function test_narrow_delegate_ranges_expand() {
-                tryCompareFunction(function() { return findChild(genericScopeView, "dashCategory0") !== null; }, true);
                 var category = findChild(genericScopeView, "dashCategory0")
                 tryCompare(category, "expanded", false);
 
@@ -275,7 +273,6 @@
             function test_single_category_expansion() {
                 genericScopeView.scope = scopes.getScope(3);
 
-                tryCompareFunction(function() { return findChild(genericScopeView, "dashCategory0") != undefined; }, true);
                 var category = findChild(genericScopeView, "dashCategory0")
                 compare(category.expandable, false, "Only category should not be expandable.");
 
@@ -289,9 +286,9 @@
                 if (category === undefined) category = 0;
                 if (delegate === undefined) delegate = 0;
                 tryCompareFunction(function() {
-                                        var cardGrid = findChild(genericScopeView, "dashCategory"+category);
+                                        var cardGrid = findChild(genericScopeView, "dashCategory"+category, 0 /* timeout */);
                                         if (cardGrid != null) {
-                                            var tile = findChild(cardGrid, "delegate"+delegate);
+                                            var tile = findChild(cardGrid, "delegate"+delegate, 0 /* timeout */);
                                             return tile != null;
                                         }
                                         return false;
@@ -332,9 +329,9 @@
                 genericScopeView.scope = scopes.getScope("NullPreviewScope");
 
                 tryCompareFunction(function() {
-                                        var cardGrid = findChild(genericScopeView, 0);
+                                        var cardGrid = findChild(genericScopeView, 0, 0 /* timeout */);
                                         if (cardGrid != null) {
-                                            var tile = findChild(cardGrid, 0);
+                                            var tile = findChild(cardGrid, 0, 0 /* timeout */);
                                             return tile != null;
                                         }
                                         return false;
@@ -385,7 +382,6 @@
 
                 tryCompare(testCase.subPageLoader, "open", false);
 
-                tryCompareFunction(function() { return findChild(category, "delegate1") != null; }, true);
                 var tile = findChild(category, "delegate1");
 
                 mouseClick(tile);
@@ -487,7 +483,6 @@
 
                 scrollToEnd();
 
-                tryCompareFunction(function() { return findChild(genericScopeView, "dashCategory1") !== null; }, true);
                 var category1 = findChild(genericScopeView, "dashCategory1")
                 var seeAll1 = findChild(category1, "seeAll")
                 verify(category1.expandable);
@@ -669,7 +664,6 @@
             function test_carousel_borderSource() {
                 var category = scrollToCategory("dashCategory1");
                 var tile = findChild(category, "carouselDelegate0");
-                tryCompareFunction(function() { return findChild(tile, "artShapeLoader") !== null; }, true);
                 var artShapeLoader = findChild(tile, "artShapeLoader");
                 var shape = findChildsByType(artShapeLoader, "UCUbuntuShape");
                 compare(shape.borderSource, undefined);
 
=== modified file 'tests/qmltests/Panel/tst_IndicatorPage.qml'
--- tests/qmltests/Panel/tst_IndicatorPage.qml	2015-07-15 15:07:19 +0000
+++ tests/qmltests/Panel/tst_IndicatorPage.qml	2016-08-30 09:46:12 +0000
@@ -177,8 +177,6 @@
             initializeMenuData(fullMenuData);
 
             var menuId = "menu"+data.remove
-
-            tryCompareFunction(function() { return findChild(page, menuId) !== null;}, true);
             var menu = findChild(page, menuId);
 
             menu.menuSelected();
 
=== modified file 'tests/qmltests/tst_ShellWithPin.qml'
--- tests/qmltests/tst_ShellWithPin.qml	2016-07-07 19:52:57 +0000
+++ tests/qmltests/tst_ShellWithPin.qml	2016-08-30 09:46:12 +0000
@@ -363,12 +363,11 @@
 
             enterPin("1111")
             enterPin("1111")
-            tryCompareFunction(function() {return findChild(root, "infoPopup") !== null}, true)
 
             var dialog = findChild(root, "infoPopup")
             var button = findChild(dialog, "infoPopupOkButton")
             tap(button)
-            tryCompareFunction(function() {return findChild(root, "infoPopup")}, null)
+            tryCompareFunction(function() {return findChild(root, "infoPopup", 0 /* timeout */)}, null)
 
             tryCompare(resetSpy, "count", 0)
             enterPin("1111")