git.iko.soy/unity8
on xenial help sign in
TIme out findChild faster when we expect null
b0f054cDalton Durst
tests/qmltests/tst_Shell.qml+3−3
compare with xenial
unifiedsplit
@@ -2134,7 +2134,7 @@ Rectangle {
2134 waitForRendering(shell);
2134 waitForRendering(shell);
2135
2135
2136 // No legacy app running yet... Popup must *not* show.
2136 // No legacy app running yet... Popup must *not* show.
2137− var popup = findChild(dialogs, "modeSwitchWarningDialog");
2137+ var popup = findChild(dialogs, "modeSwitchWarningDialog", 1000);
2138 compare(popup, null);
2138 compare(popup, null);
2139
2139
2140 shell.usageScenario = "desktop"
2140 shell.usageScenario = "desktop"
@@ -2147,7 +2147,7 @@ Rectangle {
2147 waitForRendering(shell);
2147 waitForRendering(shell);
2148
2148
2149 // The popup must appear now, unless in "tablet" mode
2149 // The popup must appear now, unless in "tablet" mode
2150− popup = findChild(dialogs, "modeSwitchWarningDialog");
2150+ popup = findChild(dialogs, "modeSwitchWarningDialog", 1000);
2151 if (data.tabletMode) {
2151 if (data.tabletMode) {
2152 verify(!popup);
2152 verify(!popup);
2153 } else {
2153 } else {
@@ -2164,7 +2164,7 @@ Rectangle {
2164 }
2164 }
2165
2165
2166 // Popup must be gone now
2166 // Popup must be gone now
2167− popup = findChild(dialogs, "modeSwitchWarningDialog");
2167+ popup = findChild(dialogs, "modeSwitchWarningDialog", 1000);
2168 tryCompareFunction(function() { return popup === null}, true);
2168 tryCompareFunction(function() { return popup === null}, true);
2169
2169
2170 if (data.replug || data.tabletMode) {
2170 if (data.replug || data.tabletMode) {