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

Commit f5d9ddf3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Ignore failing RecoverableKeyStoreManager tests." into udc-dev am:... 

Merge "Ignore failing RecoverableKeyStoreManager tests." into udc-dev am: bbfaff30 am: 53cc7af7 am: 16f5d4d4 am: 2900cf97

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23111844



Change-Id: I1ee9ebd65f514b29526ddb43613c4a0f5401263a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a79b0b03 2900cf97

services/tests/servicestests/src/com/android/server/locksettings/recoverablekeystore/RecoverableKeyStoreManagerTest.java

+15 −0
Original line number Diff line number Diff line
@@ -373,6 +373,7 @@ public class RecoverableKeyStoreManagerTest { 
        assertThat(mRecoverableKeyStoreDb.getShouldCreateSnapshot(userId, uid)).isFalse();

    }



    @Ignore("Causing breakages so ignoring to resolve, b/281583079")

    @Test

    public void initRecoveryService_succeedsWithCertFile() throws Exception {

        int uid = Binder.getCallingUid();
@@ -394,6 +395,7 @@ public class RecoverableKeyStoreManagerTest { 
        assertThat(mRecoverableKeyStoreDb.getRecoveryServicePublicKey(userId, uid)).isNull();

    }



    @Ignore("Causing breakages so ignoring to resolve, b/281583079")

    @Test

    public void initRecoveryService_updatesShouldCreatesnapshotOnCertUpdate() throws Exception {

        int uid = Binder.getCallingUid();
@@ -421,6 +423,7 @@ public class RecoverableKeyStoreManagerTest { 
        assertThat(mRecoverableKeyStoreDb.getShouldCreateSnapshot(userId, uid)).isTrue();

    }



    @Ignore("Causing breakages so ignoring to resolve, b/281583079")

    @Test

    public void initRecoveryService_triesToFilterRootAlias() throws Exception {

        int uid = Binder.getCallingUid();
@@ -442,6 +445,7 @@ public class RecoverableKeyStoreManagerTest { 


    }



    @Ignore("Causing breakages so ignoring to resolve, b/281583079")

    @Test

    public void initRecoveryService_usesProdCertificateForEmptyRootAlias() throws Exception {

        int uid = Binder.getCallingUid();
@@ -462,6 +466,7 @@ public class RecoverableKeyStoreManagerTest { 
        assertThat(activeRootAlias).isEqualTo(DEFAULT_ROOT_CERT_ALIAS);

    }



    @Ignore("Causing breakages so ignoring to resolve, b/281583079")

    @Test

    public void initRecoveryService_usesProdCertificateForNullRootAlias() throws Exception {

        int uid = Binder.getCallingUid();
@@ -482,6 +487,7 @@ public class RecoverableKeyStoreManagerTest { 
        assertThat(activeRootAlias).isEqualTo(DEFAULT_ROOT_CERT_ALIAS);

    }



    @Ignore("Causing breakages so ignoring to resolve, b/281583079")

    @Test

    public void initRecoveryService_regeneratesCounterId() throws Exception {

        int uid = Binder.getCallingUid();
@@ -512,6 +518,7 @@ public class RecoverableKeyStoreManagerTest { 
        }

    }



    @Ignore("Causing breakages so ignoring to resolve, b/281583079")

    @Test

    public void initRecoveryService_updatesWithLargerSerial() throws Exception {

        int uid = Binder.getCallingUid();
@@ -529,6 +536,7 @@ public class RecoverableKeyStoreManagerTest { 
        assertThat(mRecoverableKeyStoreDb.getShouldCreateSnapshot(userId, uid)).isFalse();

    }



    @Ignore("Causing breakages so ignoring to resolve, b/281583079")

    @Test

    public void initRecoveryService_throwsExceptionOnSmallerSerial() throws Exception {

        long certSerial = 1000L;
@@ -592,6 +600,7 @@ public class RecoverableKeyStoreManagerTest { 
                        TestData.getInsecureCertPathForEndpoint1());

    }



    @Ignore("Causing breakages so ignoring to resolve, b/281583079")

    @Test

    public void initRecoveryService_ignoresTheSameSerial() throws Exception {

        int uid = Binder.getCallingUid();
@@ -642,6 +651,7 @@ public class RecoverableKeyStoreManagerTest { 
        }

    }



    @Ignore("Causing breakages so ignoring to resolve, b/281583079")

    @Test

    public void initRecoveryServiceWithSigFile_succeeds() throws Exception {

        int uid = Binder.getCallingUid();
@@ -657,6 +667,7 @@ public class RecoverableKeyStoreManagerTest { 
        assertThat(mRecoverableKeyStoreDb.getRecoveryServicePublicKey(userId, uid)).isNull();

    }



    @Ignore("Causing breakages so ignoring to resolve, b/281583079")

    @Test

    public void initRecoveryServiceWithSigFile_usesProdCertificateForNullRootAlias()

            throws Exception {
@@ -749,6 +760,7 @@ public class RecoverableKeyStoreManagerTest { 
                        eq(Manifest.permission.RECOVER_KEYSTORE), any());

    }



    @Ignore("Causing breakages so ignoring to resolve, b/281583079")

    @Test

    public void startRecoverySessionWithCertPath_storesTheSessionInfo() throws Exception {

        mRecoverableKeyStoreManager.startRecoverySessionWithCertPath(
@@ -766,6 +778,7 @@ public class RecoverableKeyStoreManagerTest { 
        assertEquals(KEY_CLAIMANT_LENGTH_BYTES, entry.getKeyClaimant().length);

    }



    @Ignore("Causing breakages so ignoring to resolve, b/281583079")

    @Test

    public void startRecoverySessionWithCertPath_checksPermissionFirst() throws Exception {

        mRecoverableKeyStoreManager.startRecoverySessionWithCertPath(
@@ -869,6 +882,7 @@ public class RecoverableKeyStoreManagerTest { 
        }

    }



    @Ignore("Causing breakages so ignoring to resolve, b/281583079")

    @Test

    public void startRecoverySessionWithCertPath_throwsIfBadNumberOfSecrets() throws Exception {

        try {
@@ -886,6 +900,7 @@ public class RecoverableKeyStoreManagerTest { 
        }

    }



    @Ignore("Causing breakages so ignoring to resolve, b/281583079")

    @Test

    public void startRecoverySessionWithCertPath_throwsIfPublicKeysMismatch() throws Exception {

        byte[] vaultParams = TEST_VAULT_PARAMS.clone();