git.iko.soy/unity8
on xenial help sign in
more safe waits
071d208Albert Astals
tests/qmltests/Dash/tst_DashContent.qml+12−6
compare with xenial
unifiedsplit
@@ -292,8 +292,10 @@ Item {
292 compare(dashNavigationButton.showList, true);
292 compare(dashNavigationButton.showList, true);
293
293
294 var navigationListView = findChild(dashNavigationButton, "navigationListView");
294 var navigationListView = findChild(dashNavigationButton, "navigationListView");
295+ tryCompareFunction(function() {
295− tryCompare(navigationListView, "count", 1);
296+ return navigationListView.currentItem &&
297+ navigationListView.currentItem.navigation &&
296− tryCompare(navigationListView.currentItem.navigation, "loaded", true);
298+ navigationListView.currentItem.navigation.loaded; }, true);
297
299
298 waitForRendering(navigationListView);
300 waitForRendering(navigationListView);
299 waitForRendering(navigationListView.currentItem);
301 waitForRendering(navigationListView.currentItem);
@@ -410,8 +412,10 @@ Item {
410 compare(dashNavigationButton.showList, true);
412 compare(dashNavigationButton.showList, true);
411
413
412 var navigationListView = findChild(dashNavigationButton, "navigationListView");
414 var navigationListView = findChild(dashNavigationButton, "navigationListView");
415+ tryCompareFunction(function() {
413− tryCompare(navigationListView, "count", 1);
416+ return navigationListView.currentItem &&
417+ navigationListView.currentItem.navigation &&
414− tryCompare(navigationListView.currentItem.navigation, "loaded", true);
418+ navigationListView.currentItem.navigation.loaded; }, true);
415
419
416 waitForRendering(navigationListView);
420 waitForRendering(navigationListView);
417 waitForRendering(navigationListView.currentItem);
421 waitForRendering(navigationListView.currentItem);
@@ -475,8 +479,10 @@ Item {
475 compare(dashAltNavigationButton.showList, true);
479 compare(dashAltNavigationButton.showList, true);
476
480
477 var navigationListView = findChild(dashAltNavigationButton, "navigationListView");
481 var navigationListView = findChild(dashAltNavigationButton, "navigationListView");
482+ tryCompareFunction(function() {
478− tryCompare(navigationListView, "count", 1);
483+ return navigationListView.currentItem &&
484+ navigationListView.currentItem.navigation &&
479− tryCompare(navigationListView.currentItem.navigation, "loaded", true);
485+ navigationListView.currentItem.navigation.loaded; }, true);
480
486
481 var blackRect = findChild(dashNavigation, "blackRect");
487 var blackRect = findChild(dashNavigation, "blackRect");
482 tryCompare(blackRect, "opacity", 0.5);
488 tryCompare(blackRect, "opacity", 0.5);