on xenial help sign in
fix ShellWithPin test failures
commitfaed16c58d7791b30c5e239df80571408d9c61ce authorLukáš Tinkl <lukas.tinkl@canonical.com> dateTue 20 Sep 2016, 17:42 (10 years ago) parenta59daa5
2 files changed+6−6
tests/qmltests/Stage/tst_TabletStage.qml+1 tests/qmltests/tst_ShellWithPin.qml+5−6
tests/qmltests/Stage/tst_TabletStage.qml+1
@@ -87,6 +87,7 @@ Rectangle {
8787 Button {
8888 text: testCase.sideStage ? testCase.sideStage.shown ? "Hide Side-stage" : "Show Side-stage" : ""
8989 enabled: testCase.sideStage
90+ activeFocusOnPress: false
9091 onClicked: {
9192 if (testCase.sideStage.shown) testCase.sideStage.hide();
9293 else testCase.sideStage.show();
tests/qmltests/tst_ShellWithPin.qml+5−6
@@ -393,7 +393,7 @@ Item {
393393 // dialer to a side stage and give access to other apps. So just
394394 // confirm that such an attack doesn't work.
395395
396− var applicationsDisplayLoader = findChild(shell, "applicationsDisplayLoader")
396+ var applicationsDisplayLoader = findChild(shell, "stage")
397397
398398 // We start in phone mode
399399 compare(shell.usageScenario, "phone");
@@ -497,13 +497,13 @@ Item {
497497
498498 function test_suspend() {
499499 var greeter = findChild(shell, "greeter");
500− var applicationsDisplayLoader = findChild(shell, "applicationsDisplayLoader")
500+ var applicationsDisplayLoader = findChild(shell, "stage")
501501
502502 // Put it to sleep
503503 Powerd.setStatus(Powerd.Off, Powerd.Unknown);
504504
505505 // If locked, applicationsDisplayLoader.item.suspended should be true
506− tryCompare(applicationsDisplayLoader.item, "suspended", true);
506+ tryCompare(applicationsDisplayLoader, "suspended", true);
507507
508508 // And wake up
509509 Powerd.setStatus(Powerd.On, Powerd.Unknown);
@@ -513,13 +513,12 @@ Item {
513513 swipeAwayGreeter(true);
514514
515515 // We have a lockscreen, make sure we're still suspended
516− tryCompare(applicationsDisplayLoader.item, "suspended", true);
516+ tryCompare(applicationsDisplayLoader, "suspended", true);
517517
518518 enterPin("1234")
519519
520520 // Now that the lockscreen has gone too, make sure we're waking up
521− tryCompare(applicationsDisplayLoader.item, "suspended", false);
522−
521+ tryCompare(applicationsDisplayLoader, "suspended", false);
523522 }
524523
525524 /* We had a bug (1395075) where if a user kept swiping as the greeter