d06bab6 · unity8 · git.iko.soy

git.iko.soy/unity8

Fix qmltests

commitd06bab641682e2ddcf76a530192d3927ebff30d7 authorMichael Terry <michael.terry@canonical.com> dateTue 24 Nov 2015, 10:04 (11 years ago) parent90c8d36

4 files changed+11−32

compare with xenial

unifiedsplit

qml/Greeter/Greeter.qml+1−1 tests/qmltests/Greeter/tst_Greeter.qml+7−1 tests/qmltests/tst_Shell.qml+3−8 tests/qmltests/tst_ShellWithPin.qml−22

qml/Greeter/Greeter.qml+1−1

@@ -164,8 +164,8 @@ Showable {

164164 function checkForcedUnlock() {

165165 if (forcedUnlock && shown && loader.item) {

166166 // pretend we were just authenticated

167− loader.item.hide();

168167 loader.item.notifyAuthenticationSucceeded();

168+ loader.item.hide();

169169 }

170170 }

171171 }

tests/qmltests/Greeter/tst_Greeter.qml+7−1

@@ -328,9 +328,15 @@ Item {

328328 LightDM.Greeter.active = true;

329329

330330 greeter.forcedUnlock = true;

331− compare(view.locked, false);

331+ compare(greeter.required, false);

332332 greeter.forcedUnlock = false;

333333

334+ // Now recover from tearing down the view above

335+ LightDM.Greeter.showGreeter();

336+ tryCompare(greeter, "required", true);

337+ tryCompare(greeter, "waiting", false);

338+ view = findChild(greeter, "testView");

339+

334340 selectUser("no-password");

335341 tryCompare(view, "locked", false);

336342 selectUser("has-password");

tests/qmltests/tst_Shell.qml+3−8

@@ -384,6 +384,7 @@ Rectangle {

384384 setLightDMMockMode("single"); // back to the default value

385385

386386 AccountsService.demoEdges = false;

387+ AccountsService.demoEdgesCompleted = [];

387388 Wizard.System.wizardEnabled = false;

388389

389390 // kill all (fake) running apps

@@ -535,9 +536,8 @@ Rectangle {

535536

536537 function test_tabletLeftEdgeDrag_data() {

537538 return [

538− {tag: "without password", user: "no-password", loggedIn: true, demo: false},

539− {tag: "with password", user: "has-password", loggedIn: false, demo: false},

540− {tag: "with demo", user: "has-password", loggedIn: true, demo: true},

539+ {tag: "without password", user: "no-password", loggedIn: true},

540+ {tag: "with password", user: "has-password", loggedIn: false},

541541 ]

542542 }

543543

@@ -547,10 +547,6 @@ Rectangle {

547547

548548 selectUser(data.user)

549549

550− AccountsService.demoEdges = data.demo

551− var tutorial = findChild(shell, "tutorial");

552− tryCompare(tutorial, "running", data.demo);

553−

554550 swipeFromLeftEdge(shell.width * 0.75)

555551 wait(500) // to give time to handle dash() signal from Launcher

556552 confirmLoggedIn(data.loggedIn)

@@ -1130,7 +1126,6 @@ Rectangle {

11301126 var tutorial = findChild(shell, "tutorial");

11311127

11321128 AccountsService.demoEdges = true;

1133− tryCompare(tutorial, "running", true);

11341129 tryCompare(tutorial, "paused", true);

11351130

11361131 swipeAwayGreeter();

tests/qmltests/tst_ShellWithPin.qml−22

@@ -251,28 +251,6 @@ Item {

251251 tryCompare(sessionSpy, "count", 1)

252252 }

253253

254− function test_edgeDemoHidesLockscreen() {

255− LightDM.Greeter.showGreeter()

256− sessionSpy.clear()

257− var lockscreen = findChild(shell, "lockscreen")

258−

259− tryCompare(lockscreen, "shown", true)

260− AccountsService.demoEdges = true

261− tryCompare(lockscreen, "shown", false)

262−

263− var greeter = findChild(shell, "greeter");

264− swipeAwayGreeter(false);

265− tryCompare(greeter, "shown", false);

266− tryCompare(sessionSpy, "count", 1)

267−

268− // Lockscreen is only hidden by the edge demo, so if we turn that

269− // off and show greeter again, lockscreen should appear

270− AccountsService.demoEdges = false

271− LightDM.Greeter.showGreeter()

272− lockscreen = findChild(shell, "lockscreen");

273− tryCompare(lockscreen, "shown", true)

274− }

275−

276254 function test_disabledEdges() {

277255 var launcher = findChild(shell, "launcher")

278256 tryCompare(launcher, "available", true)