Merge "Fix flaky unit test" (40e79893) · Commits · e / os / android_frameworks_base

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -35,7 +35,6 @@ import android.os.RemoteException;
		import android.os.UserHandle;
		import android.platform.test.annotations.Presubmit;

		import androidx.test.filters.FlakyTest;
		import androidx.test.filters.SmallTest;

		import com.android.internal.widget.LockPatternUtils;
		@@ -337,13 +336,15 @@ public class SyntheticPasswordTests extends BaseLockSettingsServiceTests {
		assertTrue(hasSyntheticPassword(MANAGED_PROFILE_USER_ID));
		}

		@FlakyTest(bugId = 140308162)
		public void testTokenBasedResetPassword() throws RemoteException {
		final byte[] password = "password".getBytes();
		final byte[] pattern = "123654".getBytes();
		final byte[] token = "some-high-entropy-secure-token".getBytes();
		initializeCredentialUnderSP(password, PRIMARY_USER_ID);
		// Disregard any reportPasswordChanged() invocations as part of credential setup.
		flushHandlerTasks();
		reset(mDevicePolicyManager);

		final byte[] storageKey = mStorageManager.getUserUnlockToken(PRIMARY_USER_ID);

		assertFalse(mService.hasPendingEscrowToken(PRIMARY_USER_ID));