2c64a01 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Fix two broken qmluitest files by waiting for everything to settle before starting the tests.

2c64a01Michael Terry12 years ago

tests/qmltests/Greeter/tst_WideView.qml+10−3

compare with xenial

unifiedsplit

@@ -313,7 +313,7 @@ Item {

313 property Item view: loader.status === Loader.Ready ? loader.item : null

314

315 function init() {

316− view.currentIndex = 0; // break binding with text field

316+ selectIndex(0); // break binding with text field

317 selectedSpy.clear();

318 respondedSpy.clear();

319 teaseSpy.clear();

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

343 return -1;

344 }

345

346+ function selectIndex(i) {

347+ view.currentIndex = i;

348+ var userList = findChild(view, "userList");

349+ tryCompare(userList, "movingInternally", false);

350+ }

351+

346 function selectUser(name) {

352 function selectUser(name) {

347 var i = getIndexOf(name);

353 var i = getIndexOf(name);

348− view.currentIndex = i;

354+ selectIndex(i);

349 return i;

355 return i;

350 }

356 }

351

357

@@ -441,7 +447,8 @@ Item {

441

447

442 // Escape is used to reset the authentication, especially if PAM is unresponsive

448 // Escape is used to reset the authentication, especially if PAM is unresponsive

443 function test_escape() {

449 function test_escape() {

444− view.currentIndex = 1;

450+ selectIndex(1);

451+ selectedSpy.clear();

445 view.locked = true;

452 view.locked = true;

446 view.showPrompt("Prompt", true, true);

453 view.showPrompt("Prompt", true, true);

447 var passwordInput = findChild(view, "passwordInput");

454 var passwordInput = findChild(view, "passwordInput");

tests/qmltests/tst_Shell.qml+1

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

537 tryCompare(userlist, "currentIndex", next)

538 tryCompare(userlist, "movingInternally", false)

539 }

540+ tryCompare(shell, "enabled", true); // wait for PAM to settle

540 }

541 }

541

542

542 function selectUser(name) {

543 function selectUser(name) {