git.iko.soy/unity8
on xenial help sign in
Make tests slightly more robust
80ba846Josh Arenson
tests/qmltests/Greeter/tst_WideView.qml+5−5
compare with xenial
unifiedsplit
@@ -407,10 +407,10 @@ Item {
407 view.loginListShown = false;
407 view.loginListShown = false;
408 var sessionsList = findChild(view, "sessionsList");
408 var sessionsList = findChild(view, "sessionsList");
409 var sessionsListSelector = findChild(view, "sessionsListSelector");
409 var sessionsListSelector = findChild(view, "sessionsListSelector");
410− waitForRendering(sessionsList);
410+ tryCompare(sessionsList, "visible", true);
411− compare(sessionsListSelector.expanded, true);
411+ tryCompare(sessionsListSelector, "expanded", true);
412− compare(sessionsList.visible, true);
413
412
413+ waitForRendering(sessionsList)
414 for (var i = 0; i < LightDM.Sessions.count; i++) {
414 for (var i = 0; i < LightDM.Sessions.count; i++) {
415 var delegateName = "sessionDelegate" + String(i);
415 var delegateName = "sessionDelegate" + String(i);
416 var currentDelegate = findChild(view, delegateName);
416 var currentDelegate = findChild(view, delegateName);
@@ -459,7 +459,7 @@ Item {
459 compare(LightDM.Sessions.count, 1);
459 compare(LightDM.Sessions.count, 1);
460
460
461 var sessionChooserButton = findChild(view, "sessionChooserButton");
461 var sessionChooserButton = findChild(view, "sessionChooserButton");
462− compare(sessionChooserButton.visible, false);
462+ tryCompare(sessionChooserButton, "visible", false);
463 }
463 }
464
464
465 function test_sessionIconShownWithMultipleSessions() {
465 function test_sessionIconShownWithMultipleSessions() {
@@ -467,7 +467,7 @@ Item {
467 compare(LightDM.Sessions.count > 1, true);
467 compare(LightDM.Sessions.count > 1, true);
468
468
469 var sessionChooserButton = findChild(view, "sessionChooserButton");
469 var sessionChooserButton = findChild(view, "sessionChooserButton");
470− compare(sessionChooserButton.visible, true);
470+ tryCompare(sessionChooserButton, "visible", true);
471 }
471 }
472
472
473 function test_tease(data) {
473 function test_tease(data) {