From 61ab48f3a2d791b38e3a474c0a21f2f175e46058 Mon Sep 17 00:00:00 2001 From: Rubin Xu Date: Mon, 2 Sep 2019 13:55:05 +0100 Subject: [PATCH] Fix flaky unit test Bug: 140308162 Test: atest --generate-new-metrics 100 SyntheticPasswordTests#testTokenBasedResetPassword Change-Id: I07281f8689a259786ba939a84442e010656a8169 --- .../android/server/locksettings/SyntheticPasswordTests.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/services/tests/servicestests/src/com/android/server/locksettings/SyntheticPasswordTests.java b/services/tests/servicestests/src/com/android/server/locksettings/SyntheticPasswordTests.java index 37622714c11c2..127cf49707257 100644 --- a/services/tests/servicestests/src/com/android/server/locksettings/SyntheticPasswordTests.java +++ b/services/tests/servicestests/src/com/android/server/locksettings/SyntheticPasswordTests.java @@ -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));