Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix LockSettingsService unit test flakiness" into qt-dev

Browse Source
This commit is contained in:
Rubin Xu
2019-05-15 14:21:18 +00:00
committed by Android (Google) Code Review
parent 3d622b7016 340e5bac48
commit 873e062950
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/tests/servicestests/src/com/android/server/locksettings/BaseLockSettingsServiceTests.java
View File

@@ -235,6 +235,10 @@ public abstract class BaseLockSettingsServiceTests extends AndroidTestCase {
mPasswordSlotManager.cleanup(); mPasswordSlotManager.cleanup();
} }
protected void flushHandlerTasks() {
mService.mHandler.runWithScissors(() -> { }, 0 /*now*/); // Flush runnables on handler
}
protected void assertNotEquals(long expected, long actual) { protected void assertNotEquals(long expected, long actual) {
assertTrue(expected != actual); assertTrue(expected != actual);
} }

1
services/tests/servicestests/src/com/android/server/locksettings/LockSettingsServiceTestable.java
View File

@@ -163,5 +163,4 @@ public class LockSettingsServiceTestable extends LockSettingsService {
} }
return storedData; return storedData;
} }
} }

9
services/tests/servicestests/src/com/android/server/locksettings/SyntheticPasswordTests.java
View File

@@ -232,7 +232,7 @@ public class SyntheticPasswordTests extends BaseLockSettingsServiceTests {
reset(mAuthSecretService); reset(mAuthSecretService);
mService.onUnlockUser(PRIMARY_USER_ID); mService.onUnlockUser(PRIMARY_USER_ID);
mService.mHandler.runWithScissors(() -> {}, 0 /*now*/); // Flush runnables on handler flushHandlerTasks();
verify(mAuthSecretService, never()).primaryUserCredential(any(ArrayList.class)); verify(mAuthSecretService, never()).primaryUserCredential(any(ArrayList.class));
} }
@@ -242,7 +242,7 @@ public class SyntheticPasswordTests extends BaseLockSettingsServiceTests {
reset(mAuthSecretService); reset(mAuthSecretService);
mService.onUnlockUser(PRIMARY_USER_ID); mService.onUnlockUser(PRIMARY_USER_ID);
mService.mHandler.runWithScissors(() -> {}, 0 /*now*/); // Flush runnables on handler flushHandlerTasks();
verify(mAuthSecretService, never()).primaryUserCredential(any(ArrayList.class)); verify(mAuthSecretService, never()).primaryUserCredential(any(ArrayList.class));
} }
@@ -254,7 +254,7 @@ public class SyntheticPasswordTests extends BaseLockSettingsServiceTests {
reset(mAuthSecretService); reset(mAuthSecretService);
mService.onUnlockUser(PRIMARY_USER_ID); mService.onUnlockUser(PRIMARY_USER_ID);
mService.mHandler.runWithScissors(() -> {}, 0 /*now*/); // Flush runnables on handler flushHandlerTasks();
verify(mAuthSecretService).primaryUserCredential(any(ArrayList.class)); verify(mAuthSecretService).primaryUserCredential(any(ArrayList.class));
} }
@@ -357,7 +357,7 @@ public class SyntheticPasswordTests extends BaseLockSettingsServiceTests {
handle, token, PASSWORD_QUALITY_SOMETHING, PRIMARY_USER_ID); handle, token, PASSWORD_QUALITY_SOMETHING, PRIMARY_USER_ID);
// Verify DPM gets notified about new device lock // Verify DPM gets notified about new device lock
mService.mHandler.runWithScissors(() -> {}, 0 /*now*/); // Flush runnables on handler flushHandlerTasks();
final PasswordMetrics metric = PasswordMetrics.computeForCredential( final PasswordMetrics metric = PasswordMetrics.computeForCredential(
LockPatternUtils.CREDENTIAL_TYPE_PATTERN, pattern); LockPatternUtils.CREDENTIAL_TYPE_PATTERN, pattern);
verify(mDevicePolicyManager).setActivePasswordState(metric, PRIMARY_USER_ID); verify(mDevicePolicyManager).setActivePasswordState(metric, PRIMARY_USER_ID);
@@ -384,6 +384,7 @@ public class SyntheticPasswordTests extends BaseLockSettingsServiceTests {
mLocalService.setLockCredentialWithToken(null, LockPatternUtils.CREDENTIAL_TYPE_NONE, mLocalService.setLockCredentialWithToken(null, LockPatternUtils.CREDENTIAL_TYPE_NONE,
handle, token, PASSWORD_QUALITY_UNSPECIFIED, PRIMARY_USER_ID); handle, token, PASSWORD_QUALITY_UNSPECIFIED, PRIMARY_USER_ID);
flushHandlerTasks(); // flush the unlockUser() call before changing password again
mLocalService.setLockCredentialWithToken(pattern, LockPatternUtils.CREDENTIAL_TYPE_PATTERN, mLocalService.setLockCredentialWithToken(pattern, LockPatternUtils.CREDENTIAL_TYPE_PATTERN,
handle, token, PASSWORD_QUALITY_SOMETHING, PRIMARY_USER_ID); handle, token, PASSWORD_QUALITY_SOMETHING, PRIMARY_USER_ID);