on xenial help sign in
more safe waits
commit071d20867175144aa0f97dab1b24369499e6ec45 authorAlbert Astals <albert.astals@canonical.com> dateMon 15 Dec 2014, 15:06 (12 years ago) parent819c4de
1 file changed+12−6
tests/qmltests/Dash/tst_DashContent.qml+12−6
tests/qmltests/Dash/tst_DashContent.qml+12−6
@@ -292,8 +292,10 @@ Item {
292292 compare(dashNavigationButton.showList, true);
293293
294294 var navigationListView = findChild(dashNavigationButton, "navigationListView");
295− tryCompare(navigationListView, "count", 1);
296− tryCompare(navigationListView.currentItem.navigation, "loaded", true);
295+ tryCompareFunction(function() {
296+ return navigationListView.currentItem &&
297+ navigationListView.currentItem.navigation &&
298+ navigationListView.currentItem.navigation.loaded; }, true);
297299
298300 waitForRendering(navigationListView);
299301 waitForRendering(navigationListView.currentItem);
@@ -410,8 +412,10 @@ Item {
410412 compare(dashNavigationButton.showList, true);
411413
412414 var navigationListView = findChild(dashNavigationButton, "navigationListView");
413− tryCompare(navigationListView, "count", 1);
414− tryCompare(navigationListView.currentItem.navigation, "loaded", true);
415+ tryCompareFunction(function() {
416+ return navigationListView.currentItem &&
417+ navigationListView.currentItem.navigation &&
418+ navigationListView.currentItem.navigation.loaded; }, true);
415419
416420 waitForRendering(navigationListView);
417421 waitForRendering(navigationListView.currentItem);
@@ -475,8 +479,10 @@ Item {
475479 compare(dashAltNavigationButton.showList, true);
476480
477481 var navigationListView = findChild(dashAltNavigationButton, "navigationListView");
478− tryCompare(navigationListView, "count", 1);
479− tryCompare(navigationListView.currentItem.navigation, "loaded", true);
482+ tryCompareFunction(function() {
483+ return navigationListView.currentItem &&
484+ navigationListView.currentItem.navigation &&
485+ navigationListView.currentItem.navigation.loaded; }, true);
480486
481487 var blackRect = findChild(dashNavigation, "blackRect");
482488 tryCompare(blackRect, "opacity", 0.5);