2ec2c6a · unity8 · git.iko.soy

git.iko.soy/unity8

Patch tests so that they pass. Thanks to mterry for this patch.

commit2ec2c6aac18b4f5ad634b943365a5f8e797508fd authorJosh Arenson <joshua.arenson@canonical.com> dateTue 14 Jun 2016, 10:52 (10 years ago) parent838d758

2 files changed+5−15

compare with xenial

unifiedsplit

qml/Greeter/Greeter.qml+1−3 tests/qmltests/tst_Shell.qml+4−12

qml/Greeter/Greeter.qml+1−3

@@ -307,9 +307,7 @@ Showable {

307307 if (root.locked) {

308308 LightDMService.greeter.respond(response);

309309 } else {

310− if (LightDMService.greeter.active && !LightDMService.greeter.authenticated) { // could happen if forcedUnlock

311− d.login();

312− }

310+ d.login();

313311 loader.item.hide();

314312 }

315313 }

tests/qmltests/tst_Shell.qml+4−12

@@ -1142,16 +1142,13 @@ Rectangle {

11421142

11431143 function test_greeterLoginsAutomaticallyWhenNoPasswordSet() {

11441144 loadShell("phone");

1145− swipeAwayGreeter();

1146−

1147− sessionSpy.clear();

1148− verify(sessionSpy.valid);

1149−

1150− showGreeter();

11511145

11521146 var greeter = findChild(shell, "greeter");

11531147 verify(!greeter.locked);

1154− verify(sessionSpy.count > 0);

1148+ compare(sessionSpy.count, 0);

1149+

1150+ swipeAwayGreeter();

1151+ compare(sessionSpy.count, 1);

11551152 }

11561153

11571154 function test_fullscreen() {

@@ -2189,11 +2186,6 @@ Rectangle {

21892186 shell.usageScenario = "desktop";

21902187 GSettingsController.setAutohideLauncher(!data.launcherLocked);

21912188 waitForRendering(shell);

2192− // Not sure why 2 but it's the number of times

2193− // it triggers at this time and we need to wait

2194− // for them otherwise a sessionStarted signal will

2195− // hide the launcher and make the test fail

2196− tryCompare(sessionSpy, "count", 2);

21972189

21982190 var launcher = findChild(shell, "launcher");

21992191 var launcherPanel = findChild(launcher, "launcherPanel");