Unity 8

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

  1. findChildInTryCompareFunction
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Michał Sawicz
Approved revision: 2602
Merged at revision: 2641
Proposed branch: lp:~aacid/unity8/findChildInTryCompareFunction
Merge into: lp:unity8
Diff against target: 379 lines (+28/-47)
10 files modified
tests/qmltests/Components/tst_Carousel.qml (+0/-1)
tests/qmltests/Components/tst_Lockscreen.qml (+1/-2)
tests/qmltests/Dash/Previews/tst_Preview.qml (+0/-2)
tests/qmltests/Dash/Previews/tst_PreviewHeader.qml (+0/-4)
tests/qmltests/Dash/tst_CardTool.qml (+4/-4)
tests/qmltests/Dash/tst_Dash.qml (+8/-8)
tests/qmltests/Dash/tst_DashContent.qml (+5/-7)
tests/qmltests/Dash/tst_GenericScopeView.qml (+9/-15)
tests/qmltests/Panel/tst_IndicatorPage.qml (+0/-2)
tests/qmltests/tst_ShellWithPin.qml (+1/-2)
To merge this branch: bzr merge lp:~aacid/unity8/findChildInTryCompareFunction
Reviewer Review Type Date Requested Status
Michał Sawicz Approve
Unity8 CI Bot continuous-integration Approve
Review via email: mp+304347@code.launchpad.net

Commit message

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.

Description of the change

* 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

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

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)
Revision history for this message
Michał Sawicz (saviq) wrote :

OK then. Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/qmltests/Components/tst_Carousel.qml'
2--- tests/qmltests/Components/tst_Carousel.qml 2015-07-15 15:07:19 +0000
3+++ tests/qmltests/Components/tst_Carousel.qml 2016-08-30 09:46:12 +0000
4@@ -268,7 +268,6 @@
5
6 function test_activate() {
7 var carouselList = findChild(carousel, "listView");
8- tryCompareFunction(function() { return findChild(carouselList, "carouselDelegate3") ? true : false; }, true);
9 var carouselItem = findChild(carousel, "carouselDelegate3")
10 verify(carouselItem, "Could not find delegate");
11
12
13=== modified file 'tests/qmltests/Components/tst_Lockscreen.qml'
14--- tests/qmltests/Components/tst_Lockscreen.qml 2016-05-26 20:59:30 +0000
15+++ tests/qmltests/Components/tst_Lockscreen.qml 2016-08-30 09:46:12 +0000
16@@ -422,7 +422,6 @@
17 function test_infoPopup() {
18 verify(findChild(root, "infoPopup") === null);
19 lockscreen.showInfoPopup("foo", "bar");
20- tryCompareFunction(function() { return findChild(root, "infoPopup") !== null}, true);
21
22 var infoPopup = findChild(root, "infoPopup");
23 compare(infoPopup.title, "foo");
24@@ -434,7 +433,7 @@
25 var okButton = findChild(root, "infoPopupOkButton");
26 mouseClick(okButton);
27
28- tryCompareFunction(function() { return findChild(root, "infoPopup") === null}, true);
29+ tryCompareFunction(function() { return findChild(root, "infoPopup", 0 /* timeout */) === null}, true);
30
31 tryCompare(signalSpy, "count", 1);
32 }
33
34=== modified file 'tests/qmltests/Dash/Previews/tst_Preview.qml'
35--- tests/qmltests/Dash/Previews/tst_Preview.qml 2016-05-02 08:15:14 +0000
36+++ tests/qmltests/Dash/Previews/tst_Preview.qml 2016-08-30 09:46:12 +0000
37@@ -78,7 +78,6 @@
38
39 function test_containOnFocus() {
40 waitForRendering(preview);
41- tryCompareFunction(function () { return findChild(preview, "widget-10") != null }, true);
42 var widget = findChild(preview, "widget-10");
43
44 var bottomLeft = preview.mapFromItem(widget, 0, widget.height);
45@@ -94,7 +93,6 @@
46
47 function test_containOnGrow() {
48 waitForRendering(preview);
49- tryCompareFunction(function () { return findChild(preview, "widget-13") != null }, true);
50 var widget = findChild(preview, "widget-13");
51
52 var bottomLeft = preview.mapFromItem(widget, 0, widget.height);
53
54=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewHeader.qml'
55--- tests/qmltests/Dash/Previews/tst_PreviewHeader.qml 2016-03-10 22:39:24 +0000
56+++ tests/qmltests/Dash/Previews/tst_PreviewHeader.qml 2016-08-30 09:46:12 +0000
57@@ -116,7 +116,6 @@
58
59 tryCompare(testCase.mascotShapeLoader, "visible", data.loaderVisible);
60 if (data.loaderVisible) {
61- tryCompareFunction(function() { return findChild(previewHeader, "mascotShape") != null }, true);
62 var mascot = findChild(previewHeader, "mascotShape")
63 tryCompare(mascot, "visible", data.visible);
64 }
65@@ -165,20 +164,17 @@
66
67 function test_fallback() {
68 previewHeader.widgetData = brokenheaderjson;
69- tryCompareFunction(function() { return findChild(previewHeader, "mascotShape") != null }, true);
70 var mascot = findChild(previewHeader, "mascotShape");
71 compare(mascot.visible, false);
72
73 previewHeader.widgetData = {};
74 previewHeader.widgetData = fallbackheaderjson;
75- tryCompareFunction(function() { return findChild(previewHeader, "mascotShape") != null }, true);
76 var mascot = findChild(previewHeader, "mascotShape");
77 tryCompare(mascot, "visible", true);
78 tryCompare(mascot.source, "status", Image.Ready);
79
80 previewHeader.widgetData = {};
81 previewHeader.widgetData = emptyfallbackheaderjson;
82- tryCompareFunction(function() { return findChild(previewHeader, "mascotShape") != null }, true);
83 var mascot = findChild(previewHeader, "mascotShape");
84 tryCompare(mascot, "visible", true);
85 tryCompare(mascot.source, "status", Image.Ready);
86
87=== modified file 'tests/qmltests/Dash/tst_CardTool.qml'
88--- tests/qmltests/Dash/tst_CardTool.qml 2016-05-26 14:40:48 +0000
89+++ tests/qmltests/Dash/tst_CardTool.qml 2016-08-30 09:46:12 +0000
90@@ -339,22 +339,22 @@
91 function test_card_title_alignment(data) {
92 selector.selectedIndex = data.index;
93
94- tryCompareFunction(function() { return findChild(internalCard, "titleLabel").horizontalAlignment == Text.AlignLeft; }, true);
95+ tryCompareFunction(function() { return findChild(internalCard, "titleLabel", 0 /* timeout */).horizontalAlignment == Text.AlignLeft; }, true);
96
97 cardTool.components['title'] = { "field": "title", "align": "center" };
98 cardTool.componentsChanged();
99
100- tryCompareFunction(function() { return findChild(internalCard, "titleLabel").horizontalAlignment == data.value; }, true);
101+ tryCompareFunction(function() { return findChild(internalCard, "titleLabel", 0 /* timeout */).horizontalAlignment == data.value; }, true);
102
103 cardTool.components['title'] = { "field": "title" };
104 cardTool.componentsChanged();
105
106- tryCompareFunction(function() { return findChild(internalCard, "titleLabel").horizontalAlignment == data.value; }, true);
107+ tryCompareFunction(function() { return findChild(internalCard, "titleLabel", 0 /* timeout */).horizontalAlignment == data.value; }, true);
108
109 cardTool.components['title'] = { "field": "title", "align": "left" };
110 cardTool.componentsChanged();
111
112- tryCompareFunction(function() { return findChild(internalCard, "titleLabel").horizontalAlignment == Text.AlignLeft; }, true);
113+ tryCompareFunction(function() { return findChild(internalCard, "titleLabel", 0 /* timeout */).horizontalAlignment == Text.AlignLeft; }, true);
114 }
115
116 function test_categoryLayout_data() {
117
118=== modified file 'tests/qmltests/Dash/tst_Dash.qml'
119--- tests/qmltests/Dash/tst_Dash.qml 2016-06-21 08:14:56 +0000
120+++ tests/qmltests/Dash/tst_Dash.qml 2016-08-30 09:46:12 +0000
121@@ -76,7 +76,7 @@
122 var genericScopeView = dashContentList.currentItem;
123 var categoryListView = findChild(genericScopeView, "categoryListView");
124 tryCompareFunction(function() {
125- var category = findChild(genericScopeView, categoryName);
126+ var category = findChild(genericScopeView, categoryName, 0 /* timeout */);
127 if (category && category.y > 0 && category.y < genericScopeView.height) return true;
128 touchFlick(genericScopeView, genericScopeView.width/2, units.gu(20),
129 genericScopeView.width/2, genericScopeView.y)
130@@ -84,7 +84,7 @@
131 return false;
132 }, true);
133
134- tryCompareFunction(function() { return findChild(genericScopeView, "delegate0") !== null; }, true);
135+ tryCompareFunction(function() { return findChild(genericScopeView, "delegate0", 0 /* timeout */) !== null; }, true);
136 return findChild(genericScopeView, categoryName);
137 }
138
139@@ -94,9 +94,9 @@
140 if (category === undefined) category = 0;
141 if (delegate === undefined) delegate = 0;
142 tryCompareFunction(function() {
143- var cardGrid = findChild(genericScopeView, "dashCategory"+category);
144+ var cardGrid = findChild(genericScopeView, "dashCategory"+category, 0 /* timeout */);
145 if (cardGrid != null) {
146- var tile = findChild(cardGrid, "delegate"+delegate);
147+ var tile = findChild(cardGrid, "delegate"+delegate, 0 /* timeout */);
148 return tile != null;
149 }
150 return false;
151@@ -473,9 +473,9 @@
152 compare(dashContentList.currentItem.scopeId, "MockScope1");
153
154 tryCompareFunction(function() {
155- var cardGrid = findChild(dashContentList, "dashCategory0");
156+ var cardGrid = findChild(dashContentList, "dashCategory0", 0 /* timeout */);
157 if (cardGrid != null) {
158- var tile = findChild(cardGrid, "delegate0");
159+ var tile = findChild(cardGrid, "delegate0", 0 /* timeout */);
160 return tile != null;
161 }
162 return false;
163@@ -520,9 +520,9 @@
164 var categoryListView = findChild(dashTempScopeItem, "categoryListView");
165 categoryListView.positionAtBeginning();
166 tryCompareFunction(function() {
167- var cardGrid = findChild(dashTempScopeItem, "dashCategory0");
168+ var cardGrid = findChild(dashTempScopeItem, "dashCategory0", 0 /* timeout */);
169 if (cardGrid != null) {
170- var tile = findChild(cardGrid, "delegate0");
171+ var tile = findChild(cardGrid, "delegate0", 0 /* timeout */);
172 return tile != null;
173 }
174 return false;
175
176=== modified file 'tests/qmltests/Dash/tst_DashContent.qml'
177--- tests/qmltests/Dash/tst_DashContent.qml 2016-08-03 15:51:32 +0000
178+++ tests/qmltests/Dash/tst_DashContent.qml 2016-08-30 09:46:12 +0000
179@@ -261,11 +261,11 @@
180
181 function test_carouselAspectRatio() {
182 tryCompareFunction(function() {
183- var scope = findChild(dashContent, "scopeLoader0");
184+ var scope = findChild(dashContent, "scopeLoader0", 0 /* timeout */);
185 if (scope != null) {
186- var dashCategory1 = findChild(scope, "dashCategory1");
187+ var dashCategory1 = findChild(scope, "dashCategory1", 0 /* timeout */);
188 if (dashCategory1 != null) {
189- var tile = findChild(dashCategory1, "carouselDelegate1");
190+ var tile = findChild(dashCategory1, "carouselDelegate1", 0 /* timeout */);
191 return tile != null;
192 }
193 }
194@@ -282,7 +282,6 @@
195
196 function test_mainNavigation() {
197 var dashContentList = findChild(dashContent, "dashContentList");
198- tryCompareFunction(function() { return findChild(dashContentList.currentItem, "dashNavigation") != null; }, true);
199 var dashNavigation = findChild(dashContentList.currentItem, "dashNavigation");
200 var peExtraPanel = findChild(dashContentList.currentItem, "peExtraPanel");
201 var searchButton = findChild(dashContentList.currentItem, "search_button");
202@@ -405,7 +404,6 @@
203
204 function goToSecondLevel() {
205 var dashContentList = findChild(dashContent, "dashContentList");
206- tryCompareFunction(function() { return findChild(dashContentList.currentItem, "dashNavigation") != null; }, true);
207 var dashNavigation = findChild(dashContentList.currentItem, "dashNavigation");
208 var peExtraPanel = findChild(dashContentList.currentItem, "peExtraPanel");
209 var searchButton = findChild(dashContentList.currentItem, "search_button");
210@@ -580,7 +578,7 @@
211
212 function test_primaryFilter() {
213 var dashContentList = findChild(dashContent, "dashContentList");
214- tryCompareFunction(function() { return findChild(dashContentList.currentItem, "dashNavigation") != null; }, true);
215+ tryCompareFunction(function() { return findChild(dashContentList.currentItem, "dashNavigation", 0 /* timeout */) != null; }, true);
216 dashContentList.currentItem.item.scope.setHasNavigation(false);
217 var peExtraPanel = findChild(dashContentList.currentItem, "peExtraPanel");
218 var searchButton = findChild(dashContentList.currentItem, "search_button");
219@@ -589,7 +587,7 @@
220 mouseClick(searchButton);
221 tryCompare(peExtraPanel, "visible", true);
222
223- tryCompareFunction(function() { return findChild(peExtraPanel, "OSF3") != null; }, true);
224+ tryCompareFunction(function() { return findChild(peExtraPanel, "OSF3", 0 /* timeout */) != null; }, true);
225 }
226
227 function test_searchHint() {
228
229=== modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
230--- tests/qmltests/Dash/tst_GenericScopeView.qml 2016-06-29 14:45:18 +0000
231+++ tests/qmltests/Dash/tst_GenericScopeView.qml 2016-08-30 09:46:12 +0000
232@@ -92,7 +92,7 @@
233 function scrollToCategory(categoryName) {
234 var categoryListView = findChild(genericScopeView, "categoryListView");
235 tryCompareFunction(function() {
236- var category = findChild(genericScopeView, categoryName);
237+ var category = findChild(genericScopeView, categoryName, 0 /* timeout */);
238 if (category && category.y > 0 && category.y < genericScopeView.height) return true;
239 touchFlick(genericScopeView, genericScopeView.width/2, units.gu(20),
240 genericScopeView.width/2, genericScopeView.y)
241@@ -100,7 +100,7 @@
242 return false;
243 }, true);
244
245- tryCompareFunction(function() { return findChild(genericScopeView, "delegate0") !== null; }, true);
246+ tryCompareFunction(function() { return findChild(genericScopeView, "delegate0", 0 /* timeout */) !== null; }, true);
247 return findChild(genericScopeView, categoryName);
248 }
249
250@@ -163,7 +163,7 @@
251 }
252
253 function test_expand_collapse() {
254- tryCompareFunction(function() { return findChild(genericScopeView, "dashSectionHeader0") != null; }, true);
255+ tryCompareFunction(function() { return findChild(genericScopeView, "dashSectionHeader0", 0 /* timeout */) != null; }, true);
256
257 var category = findChild(genericScopeView, "dashCategory0")
258 var seeAll = findChild(category, "seeAll")
259@@ -184,7 +184,7 @@
260
261 function test_expand_expand_collapse() {
262 // wait for the item to be there
263- tryCompareFunction(function() { return findChild(genericScopeView, "dashSectionHeader2") != null; }, true);
264+ tryCompareFunction(function() { return findChild(genericScopeView, "dashSectionHeader2", 0 /* timeout */) != null; }, true);
265
266 var categoryListView = findChild(genericScopeView, "categoryListView");
267 categoryListView.contentY = categoryListView.height;
268@@ -212,7 +212,6 @@
269 }
270
271 function test_headerLink() {
272- tryCompareFunction(function() { return findChild(genericScopeView, "dashSectionHeader1") != null; }, true);
273 var header = findChild(genericScopeView, "dashSectionHeader1");
274
275 spy.target = genericScopeView.scope;
276@@ -231,7 +230,7 @@
277 categoryListView.contentY = categoryListView.height * 2;
278
279 // wait for the item to be there
280- tryCompareFunction(function() { return findChild(genericScopeView, "dashSectionHeader4") != null; }, true);
281+ tryCompareFunction(function() { return findChild(genericScopeView, "dashSectionHeader4", 0 /* timeout */) != null; }, true);
282
283 var categoryView = findChild(genericScopeView, "dashCategory4");
284 verify(categoryView, "Can't find the category view.");
285@@ -243,7 +242,6 @@
286 }
287
288 function test_narrow_delegate_ranges_expand() {
289- tryCompareFunction(function() { return findChild(genericScopeView, "dashCategory0") !== null; }, true);
290 var category = findChild(genericScopeView, "dashCategory0")
291 tryCompare(category, "expanded", false);
292
293@@ -275,7 +273,6 @@
294 function test_single_category_expansion() {
295 genericScopeView.scope = scopes.getScope(3);
296
297- tryCompareFunction(function() { return findChild(genericScopeView, "dashCategory0") != undefined; }, true);
298 var category = findChild(genericScopeView, "dashCategory0")
299 compare(category.expandable, false, "Only category should not be expandable.");
300
301@@ -289,9 +286,9 @@
302 if (category === undefined) category = 0;
303 if (delegate === undefined) delegate = 0;
304 tryCompareFunction(function() {
305- var cardGrid = findChild(genericScopeView, "dashCategory"+category);
306+ var cardGrid = findChild(genericScopeView, "dashCategory"+category, 0 /* timeout */);
307 if (cardGrid != null) {
308- var tile = findChild(cardGrid, "delegate"+delegate);
309+ var tile = findChild(cardGrid, "delegate"+delegate, 0 /* timeout */);
310 return tile != null;
311 }
312 return false;
313@@ -332,9 +329,9 @@
314 genericScopeView.scope = scopes.getScope("NullPreviewScope");
315
316 tryCompareFunction(function() {
317- var cardGrid = findChild(genericScopeView, 0);
318+ var cardGrid = findChild(genericScopeView, 0, 0 /* timeout */);
319 if (cardGrid != null) {
320- var tile = findChild(cardGrid, 0);
321+ var tile = findChild(cardGrid, 0, 0 /* timeout */);
322 return tile != null;
323 }
324 return false;
325@@ -385,7 +382,6 @@
326
327 tryCompare(testCase.subPageLoader, "open", false);
328
329- tryCompareFunction(function() { return findChild(category, "delegate1") != null; }, true);
330 var tile = findChild(category, "delegate1");
331
332 mouseClick(tile);
333@@ -487,7 +483,6 @@
334
335 scrollToEnd();
336
337- tryCompareFunction(function() { return findChild(genericScopeView, "dashCategory1") !== null; }, true);
338 var category1 = findChild(genericScopeView, "dashCategory1")
339 var seeAll1 = findChild(category1, "seeAll")
340 verify(category1.expandable);
341@@ -669,7 +664,6 @@
342 function test_carousel_borderSource() {
343 var category = scrollToCategory("dashCategory1");
344 var tile = findChild(category, "carouselDelegate0");
345- tryCompareFunction(function() { return findChild(tile, "artShapeLoader") !== null; }, true);
346 var artShapeLoader = findChild(tile, "artShapeLoader");
347 var shape = findChildsByType(artShapeLoader, "UCUbuntuShape");
348 compare(shape.borderSource, undefined);
349
350=== modified file 'tests/qmltests/Panel/tst_IndicatorPage.qml'
351--- tests/qmltests/Panel/tst_IndicatorPage.qml 2015-07-15 15:07:19 +0000
352+++ tests/qmltests/Panel/tst_IndicatorPage.qml 2016-08-30 09:46:12 +0000
353@@ -177,8 +177,6 @@
354 initializeMenuData(fullMenuData);
355
356 var menuId = "menu"+data.remove
357-
358- tryCompareFunction(function() { return findChild(page, menuId) !== null;}, true);
359 var menu = findChild(page, menuId);
360
361 menu.menuSelected();
362
363=== modified file 'tests/qmltests/tst_ShellWithPin.qml'
364--- tests/qmltests/tst_ShellWithPin.qml 2016-07-07 19:52:57 +0000
365+++ tests/qmltests/tst_ShellWithPin.qml 2016-08-30 09:46:12 +0000
366@@ -363,12 +363,11 @@
367
368 enterPin("1111")
369 enterPin("1111")
370- tryCompareFunction(function() {return findChild(root, "infoPopup") !== null}, true)
371
372 var dialog = findChild(root, "infoPopup")
373 var button = findChild(dialog, "infoPopupOkButton")
374 tap(button)
375- tryCompareFunction(function() {return findChild(root, "infoPopup")}, null)
376+ tryCompareFunction(function() {return findChild(root, "infoPopup", 0 /* timeout */)}, null)
377
378 tryCompare(resetSpy, "count", 0)
379 enterPin("1111")

Subscribers

People subscribed via source and target branches