git.iko.soy/unity8
on xenial help sign in
Update tst_login and add a helper showLogin() function
a16be3fDaniel d'Andrada
tests/qmltests/tst_Shell.qml+20−19
compare with xenial
unifiedsplit
@@ -317,8 +317,7 @@ Item {
317
317
318 var greeter = findChild(shell, "greeter");
318 var greeter = findChild(shell, "greeter");
319 if (data.greeterShown) {
319 if (data.greeterShown) {
320− LightDM.Greeter.showGreeter();
320+ showGreeter();
321− tryCompare(greeter, "fullyShown", true);
322 }
321 }
323
322
324 if (data.revealLauncher) {
323 if (data.revealLauncher) {
@@ -601,11 +600,25 @@ Item {
601 && itemRectInShell.y + itemRectInShell.height <= shell.height;
600 && itemRectInShell.y + itemRectInShell.height <= shell.height;
602 }
601 }
603
602
603+ function showGreeter() {
604+ var greeter = findChild(shell, "greeter");
605+ LightDM.Greeter.showGreeter();
606+ waitForRendering(greeter);
607+ tryCompare(greeter, "fullyShown", true);
608+
609+ // greeter unloads its internal components when hidden
610+ // and reloads them when shown. Thus we have to do this
611+ // again before interacting with it otherwise any
612+ // DirectionalDragAreas in there won't be easily fooled by
613+ // fake swipes.
614+ removeTimeConstraintsFromDirectionalDragAreas(greeter);
615+ }
616+
604 function test_greeterDoesNotChangeIndicatorProfile() {
617 function test_greeterDoesNotChangeIndicatorProfile() {
605 var panel = findChild(shell, "panel");
618 var panel = findChild(shell, "panel");
606 tryCompare(panel.indicators.indicatorsModel, "profile", shell.indicatorProfile);
619 tryCompare(panel.indicators.indicatorsModel, "profile", shell.indicatorProfile);
607
620
608− LightDM.Greeter.showGreeter();
621+ showGreeter();
609 tryCompare(panel.indicators.indicatorsModel, "profile", shell.indicatorProfile);
622 tryCompare(panel.indicators.indicatorsModel, "profile", shell.indicatorProfile);
610
623
611 LightDM.Greeter.hideGreeter();
624 LightDM.Greeter.hideGreeter();
@@ -640,8 +653,7 @@ Item {
640
653
641 waitUntilDashIsFocused();
654 waitUntilDashIsFocused();
642
655
643− LightDM.Greeter.showGreeter();
656+ showGreeter();
644− tryCompare(greeter, "fullyShown", true);
645
657
646 // The main point of this test
658 // The main point of this test
647 ApplicationManager.requestFocusApplication("dialer-app");
659 ApplicationManager.requestFocusApplication("dialer-app");
@@ -672,22 +684,11 @@ Item {
672 tryCompare(greeter, "shown", false)
684 tryCompare(greeter, "shown", false)
673 }
685 }
674
686
675− function test_login() {
687+ function test_greeterLoginsAutomaticallyWhenNoPasswordSet() {
676− var greeter = findChild(shell, "greeter");
677− waitForRendering(greeter);
678− LightDM.Greeter.showGreeter();
679− tryCompare(greeter, "fullyShown", true);
680−
681 sessionSpy.clear();
688 sessionSpy.clear();
689+ verify(sessionSpy.valid);
682
690
683− // greeter unloads its internal components when hidden
691+ showGreeter();
684− // and reloads them when shown. Thus we have to do this
685− // again before interacting with it otherwise any
686− // DirectionalDragAreas in there won't be easily fooled by
687− // fake swipes.
688− removeTimeConstraintsFromDirectionalDragAreas(greeter);
689−
690− swipeAwayGreeter();
691
692
692 tryCompare(sessionSpy, "count", 1);
693 tryCompare(sessionSpy, "count", 1);
693 }
694 }