428d3c4 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Fix new tests

428d3c4Michael Terry11 years ago

tests/qmltests/Greeter/tst_Greeter.qml+4−10

compare with xenial

unifiedsplit

@@ -138,6 +138,8 @@ Item {

138 }

139

140 function init() {

141+ greeterSettings.lockedOutTime = 0;

142+ resetLoader();

141 teaseSpy.clear();

143 teaseSpy.clear();

142 sessionStartedSpy.clear();

144 sessionStartedSpy.clear();

143 emergencyCallSpy.clear();

145 emergencyCallSpy.clear();

@@ -154,10 +156,9 @@ Item {

154 verifySelected(LightDM.Users.data(0, LightDM.UserRoles.NameRole));

156 verifySelected(LightDM.Users.data(0, LightDM.UserRoles.NameRole));

155 greeter.failedLoginsDelayAttempts = 7;

157 greeter.failedLoginsDelayAttempts = 7;

156 greeter.failedLoginsDelayMinutes = 5;

158 greeter.failedLoginsDelayMinutes = 5;

157− greeterSettings.lockedOutTime = 0;

158 }

159 }

159

160

160− function cleanup() {

161+ function resetLoader() {

161 loader.itemDestroyed = false;

162 loader.itemDestroyed = false;

162 loader.active = false;

163 loader.active = false;

163 tryCompare(loader, "status", Loader.Null);

164 tryCompare(loader, "status", Loader.Null);

@@ -450,16 +451,9 @@ Item {

450 verify(Math.abs(greeterSettings.lockedOutTime - timestamp) < 2000);

451 verify(Math.abs(greeterSettings.lockedOutTime - timestamp) < 2000);

451 }

452 }

452

453

453− function test_forcedDelayFromGSettings() {

454− greeter.failedLoginsDelayMinutes = 1;

455− compare(view.delayMinutes, 0);

456− greeterSettings.lockedOutTime = new Date().getTime();

457− compare(view.delayMinutes, 1);

458− }

459−

460 function test_forcedDelayOnConstruction() {

454 function test_forcedDelayOnConstruction() {

461 greeterSettings.lockedOutTime = new Date().getTime();

455 greeterSettings.lockedOutTime = new Date().getTime();

462− cleanup();

456+ resetLoader();

463 view = findChild(greeter, "testView");

457 view = findChild(greeter, "testView");

464 compare(view.delayMinutes, greeter.failedLoginsDelayMinutes);

458 compare(view.delayMinutes, greeter.failedLoginsDelayMinutes);

465 }

459 }