on xenial help sign in
Fix new tests
commit428d3c4300e928aacf1d83b4d2057d3b2d037840 authorMichael Terry <mike@mterry.name> dateFri 21 Aug 2015, 11:38 (11 years ago) parentf95cefb
1 file changed+4−10
tests/qmltests/Greeter/tst_Greeter.qml+4−10
tests/qmltests/Greeter/tst_Greeter.qml+4−10
@@ -138,6 +138,8 @@ Item {
138138 }
139139
140140 function init() {
141+ greeterSettings.lockedOutTime = 0;
142+ resetLoader();
141143 teaseSpy.clear();
142144 sessionStartedSpy.clear();
143145 emergencyCallSpy.clear();
@@ -154,10 +156,9 @@ Item {
154156 verifySelected(LightDM.Users.data(0, LightDM.UserRoles.NameRole));
155157 greeter.failedLoginsDelayAttempts = 7;
156158 greeter.failedLoginsDelayMinutes = 5;
157− greeterSettings.lockedOutTime = 0;
158159 }
159160
160− function cleanup() {
161+ function resetLoader() {
161162 loader.itemDestroyed = false;
162163 loader.active = false;
163164 tryCompare(loader, "status", Loader.Null);
@@ -450,16 +451,9 @@ Item {
450451 verify(Math.abs(greeterSettings.lockedOutTime - timestamp) < 2000);
451452 }
452453
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−
460454 function test_forcedDelayOnConstruction() {
461455 greeterSettings.lockedOutTime = new Date().getTime();
462− cleanup();
456+ resetLoader();
463457 view = findChild(greeter, "testView");
464458 compare(view.delayMinutes, greeter.failedLoginsDelayMinutes);
465459 }