Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13e5df59 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Mark one test as flaky."

parents 7febe4c5 53cdfd5b

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -35,6 +35,7 @@ import android.os.RemoteException; 
import android.os.UserHandle;

import android.os.UserHandle;

import android.platform.test.annotations.Presubmit;

import android.platform.test.annotations.Presubmit;





import androidx.test.filters.FlakyTest;

import androidx.test.filters.SmallTest;

import androidx.test.filters.SmallTest;





import com.android.internal.widget.LockPatternUtils;

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

        assertTrue(hasSyntheticPassword(MANAGED_PROFILE_USER_ID));

    }

    }





    @FlakyTest(bugId = 140308162)

    public void testTokenBasedResetPassword() throws RemoteException {

    public void testTokenBasedResetPassword() throws RemoteException {

        final byte[] password = "password".getBytes();

        final byte[] password = "password".getBytes();

        final byte[] pattern = "123654".getBytes();

        final byte[] pattern = "123654".getBytes();