git.iko.soy/unity8
on xenial help sign in
Fix tests
d1fdad3Michael Terry
tests/qmltests/tst_Shell.qml+2−2
compare with xenial
unifiedsplit
@@ -547,13 +547,13 @@ Item {
547 && itemRectInShell.y + itemRectInShell.height <= shell.height;
547 && itemRectInShell.y + itemRectInShell.height <= shell.height;
548 }
548 }
549
549
550− function test_greeterChangesIndicatorProfile() {
550+ function test_greeterDoesNotChangeIndicatorProfile() {
551 var visibleIndicators = findChild(shell, "visibleIndicators");
551 var visibleIndicators = findChild(shell, "visibleIndicators");
552 tryCompare(visibleIndicators, "profile", shell.indicatorProfile);
552 tryCompare(visibleIndicators, "profile", shell.indicatorProfile);
553
553
554 var greeter = findChild(shell, "greeter");
554 var greeter = findChild(shell, "greeter");
555 greeter.show();
555 greeter.show();
556− tryCompare(visibleIndicators, "profile", shell.indicatorProfile + "_greeter");
556+ tryCompare(visibleIndicators, "profile", shell.indicatorProfile);
557
557
558 greeter.hide();
558 greeter.hide();
559 tryCompare(visibleIndicators, "profile", shell.indicatorProfile);
559 tryCompare(visibleIndicators, "profile", shell.indicatorProfile);
tests/qmltests/tst_ShellWithPin.qml+14
@@ -218,6 +218,20 @@ Item {
218 tryCompare(ApplicationManager, "focusedApplicationId", app)
218 tryCompare(ApplicationManager, "focusedApplicationId", app)
219 }
219 }
220
220
221+ function test_greeterChangesIndicatorProfile() {
222+ var visibleIndicators = findChild(shell, "visibleIndicators");
223+ tryCompare(visibleIndicators, "profile", shell.indicatorProfile + "_greeter");
224+
225+ LightDM.Greeter.hideGreeter();
226+ tryCompare(visibleIndicators, "profile", shell.indicatorProfile);
227+
228+ LightDM.Greeter.showGreeter();
229+ tryCompare(visibleIndicators, "profile", shell.indicatorProfile + "_greeter");
230+
231+ LightDM.Greeter.hideGreeter();
232+ tryCompare(visibleIndicators, "profile", shell.indicatorProfile);
233+ }
234+
221 function test_login() {
235 function test_login() {
222 sessionSpy.clear()
236 sessionSpy.clear()
223 tryCompare(sessionSpy, "count", 0)
237 tryCompare(sessionSpy, "count", 0)