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

Merge "Ignore failing RecoverableKeyStoreManager tests."

Browse Source
This commit is contained in:
Dmitry Dementyev
2023-05-10 21:37:39 +00:00
committed by Gerrit Code Review
parent 047ddc363c 07cee0a863
commit 3e13eb5a26
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -344,6 +344,7 @@ public class RecoverableKeyStoreManagerTest {
assertThat(mRecoverableKeyStoreDb.getShouldCreateSnapshot(userId, uid)).isFalse(); assertThat(mRecoverableKeyStoreDb.getShouldCreateSnapshot(userId, uid)).isFalse();
} }
@Ignore("Causing breakages so ignoring to resolve, b/281583079")
@Test @Test
public void initRecoveryService_succeedsWithCertFile() throws Exception { public void initRecoveryService_succeedsWithCertFile() throws Exception {
int uid = Binder.getCallingUid(); int uid = Binder.getCallingUid();
@@ -365,6 +366,7 @@ public class RecoverableKeyStoreManagerTest {
assertThat(mRecoverableKeyStoreDb.getRecoveryServicePublicKey(userId, uid)).isNull(); assertThat(mRecoverableKeyStoreDb.getRecoveryServicePublicKey(userId, uid)).isNull();
} }
@Ignore("Causing breakages so ignoring to resolve, b/281583079")
@Test @Test
public void initRecoveryService_updatesShouldCreatesnapshotOnCertUpdate() throws Exception { public void initRecoveryService_updatesShouldCreatesnapshotOnCertUpdate() throws Exception {
int uid = Binder.getCallingUid(); int uid = Binder.getCallingUid();
@@ -392,6 +394,7 @@ public class RecoverableKeyStoreManagerTest {
assertThat(mRecoverableKeyStoreDb.getShouldCreateSnapshot(userId, uid)).isTrue(); assertThat(mRecoverableKeyStoreDb.getShouldCreateSnapshot(userId, uid)).isTrue();
} }
@Ignore("Causing breakages so ignoring to resolve, b/281583079")
@Test @Test
public void initRecoveryService_triesToFilterRootAlias() throws Exception { public void initRecoveryService_triesToFilterRootAlias() throws Exception {
int uid = Binder.getCallingUid(); int uid = Binder.getCallingUid();
@@ -413,6 +416,7 @@ public class RecoverableKeyStoreManagerTest {
} }
@Ignore("Causing breakages so ignoring to resolve, b/281583079")
@Test @Test
public void initRecoveryService_usesProdCertificateForEmptyRootAlias() throws Exception { public void initRecoveryService_usesProdCertificateForEmptyRootAlias() throws Exception {
int uid = Binder.getCallingUid(); int uid = Binder.getCallingUid();
@@ -433,6 +437,7 @@ public class RecoverableKeyStoreManagerTest {
assertThat(activeRootAlias).isEqualTo(DEFAULT_ROOT_CERT_ALIAS); assertThat(activeRootAlias).isEqualTo(DEFAULT_ROOT_CERT_ALIAS);
} }
@Ignore("Causing breakages so ignoring to resolve, b/281583079")
@Test @Test
public void initRecoveryService_usesProdCertificateForNullRootAlias() throws Exception { public void initRecoveryService_usesProdCertificateForNullRootAlias() throws Exception {
int uid = Binder.getCallingUid(); int uid = Binder.getCallingUid();
@@ -453,6 +458,7 @@ public class RecoverableKeyStoreManagerTest {
assertThat(activeRootAlias).isEqualTo(DEFAULT_ROOT_CERT_ALIAS); assertThat(activeRootAlias).isEqualTo(DEFAULT_ROOT_CERT_ALIAS);
} }
@Ignore("Causing breakages so ignoring to resolve, b/281583079")
@Test @Test
public void initRecoveryService_regeneratesCounterId() throws Exception { public void initRecoveryService_regeneratesCounterId() throws Exception {
int uid = Binder.getCallingUid(); int uid = Binder.getCallingUid();
@@ -483,6 +489,7 @@ public class RecoverableKeyStoreManagerTest {
} }
} }
@Ignore("Causing breakages so ignoring to resolve, b/281583079")
@Test @Test
public void initRecoveryService_updatesWithLargerSerial() throws Exception { public void initRecoveryService_updatesWithLargerSerial() throws Exception {
int uid = Binder.getCallingUid(); int uid = Binder.getCallingUid();
@@ -500,6 +507,7 @@ public class RecoverableKeyStoreManagerTest {
assertThat(mRecoverableKeyStoreDb.getShouldCreateSnapshot(userId, uid)).isFalse(); assertThat(mRecoverableKeyStoreDb.getShouldCreateSnapshot(userId, uid)).isFalse();
} }
@Ignore("Causing breakages so ignoring to resolve, b/281583079")
@Test @Test
public void initRecoveryService_throwsExceptionOnSmallerSerial() throws Exception { public void initRecoveryService_throwsExceptionOnSmallerSerial() throws Exception {
int uid = Binder.getCallingUid(); int uid = Binder.getCallingUid();
@@ -565,6 +573,7 @@ public class RecoverableKeyStoreManagerTest {
TestData.getInsecureCertPathForEndpoint1()); TestData.getInsecureCertPathForEndpoint1());
} }
@Ignore("Causing breakages so ignoring to resolve, b/281583079")
@Test @Test
public void initRecoveryService_ignoresTheSameSerial() throws Exception { public void initRecoveryService_ignoresTheSameSerial() throws Exception {
int uid = Binder.getCallingUid(); int uid = Binder.getCallingUid();
@@ -615,6 +624,7 @@ public class RecoverableKeyStoreManagerTest {
} }
} }
@Ignore("Causing breakages so ignoring to resolve, b/281583079")
@Test @Test
public void initRecoveryServiceWithSigFile_succeeds() throws Exception { public void initRecoveryServiceWithSigFile_succeeds() throws Exception {
int uid = Binder.getCallingUid(); int uid = Binder.getCallingUid();
@@ -630,6 +640,7 @@ public class RecoverableKeyStoreManagerTest {
assertThat(mRecoverableKeyStoreDb.getRecoveryServicePublicKey(userId, uid)).isNull(); assertThat(mRecoverableKeyStoreDb.getRecoveryServicePublicKey(userId, uid)).isNull();
} }
@Ignore("Causing breakages so ignoring to resolve, b/281583079")
@Test @Test
public void initRecoveryServiceWithSigFile_usesProdCertificateForNullRootAlias() public void initRecoveryServiceWithSigFile_usesProdCertificateForNullRootAlias()
throws Exception { throws Exception {
@@ -723,6 +734,7 @@ public class RecoverableKeyStoreManagerTest {
eq(Manifest.permission.RECOVER_KEYSTORE), any()); eq(Manifest.permission.RECOVER_KEYSTORE), any());
} }
@Ignore("Causing breakages so ignoring to resolve, b/281583079")
@Test @Test
public void startRecoverySessionWithCertPath_storesTheSessionInfo() throws Exception { public void startRecoverySessionWithCertPath_storesTheSessionInfo() throws Exception {
mRecoverableKeyStoreManager.startRecoverySessionWithCertPath( mRecoverableKeyStoreManager.startRecoverySessionWithCertPath(
@@ -740,6 +752,7 @@ public class RecoverableKeyStoreManagerTest {
assertEquals(KEY_CLAIMANT_LENGTH_BYTES, entry.getKeyClaimant().length); assertEquals(KEY_CLAIMANT_LENGTH_BYTES, entry.getKeyClaimant().length);
} }
@Ignore("Causing breakages so ignoring to resolve, b/281583079")
@Test @Test
public void startRecoverySessionWithCertPath_checksPermissionFirst() throws Exception { public void startRecoverySessionWithCertPath_checksPermissionFirst() throws Exception {
mRecoverableKeyStoreManager.startRecoverySessionWithCertPath( mRecoverableKeyStoreManager.startRecoverySessionWithCertPath(
@@ -809,6 +822,7 @@ public class RecoverableKeyStoreManagerTest {
} }
} }
@Ignore("Causing breakages so ignoring to resolve, b/281583079")
@Test @Test
public void startRecoverySession_throwsIfBadNumberOfSecrets() throws Exception { public void startRecoverySession_throwsIfBadNumberOfSecrets() throws Exception {
try { try {
@@ -825,6 +839,7 @@ public class RecoverableKeyStoreManagerTest {
} }
} }
@Ignore("Causing breakages so ignoring to resolve, b/281583079")
@Test @Test
public void startRecoverySession_throwsIfPublicKeysMismatch() throws Exception { public void startRecoverySession_throwsIfPublicKeysMismatch() throws Exception {
byte[] vaultParams = TEST_VAULT_PARAMS.clone(); byte[] vaultParams = TEST_VAULT_PARAMS.clone();