From b2675b4402c2c8e182fd3e7625e7d2aa99cc8425 Mon Sep 17 00:00:00 2001 From: Bo Zhu Date: Tue, 20 Feb 2018 14:49:49 -0800 Subject: [PATCH] Fix two broken tests in PersistentKeyChainSnapshotTest Bug: 73609806 Test: adb shell am instrument -w -e package \ com.android.server.locksettings.recoverablekeystore \ com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner Change-Id: I6c054fe8069c2016f8952380c0e083c6eb2b6a23 --- .../storage/PersistentKeyChainSnapshotTest.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/services/tests/servicestests/src/com/android/server/locksettings/recoverablekeystore/storage/PersistentKeyChainSnapshotTest.java b/services/tests/servicestests/src/com/android/server/locksettings/recoverablekeystore/storage/PersistentKeyChainSnapshotTest.java index 353a68f34a901..17a4d3481f761 100644 --- a/services/tests/servicestests/src/com/android/server/locksettings/recoverablekeystore/storage/PersistentKeyChainSnapshotTest.java +++ b/services/tests/servicestests/src/com/android/server/locksettings/recoverablekeystore/storage/PersistentKeyChainSnapshotTest.java @@ -176,7 +176,6 @@ public class PersistentKeyChainSnapshotTest { () -> reader.readProtectionParams()); } - @Ignore("Investigate why this is broken. b/73609806") @Test public void testKeyChainSnapshot() throws Exception { PersistentKeyChainSnapshot writer = new PersistentKeyChainSnapshot(); @@ -201,7 +200,7 @@ public class PersistentKeyChainSnapshotTest { KeyChainSnapshot snapshot = new KeyChainSnapshot.Builder() .setSnapshotVersion(SNAPSHOT_VERSION) .setKeyChainProtectionParams(protectionParamsList) - .setEncryptedRecoveryKeyBlob(KEY_MATERIAL) + .setEncryptedRecoveryKeyBlob(RECOVERY_KEY_MATERIAL) .setWrappedApplicationKeys(appKeysList) .setMaxAttempts(MAX_ATTEMPTS) .setCounterId(COUNTER_ID) @@ -218,13 +217,11 @@ public class PersistentKeyChainSnapshotTest { KeyChainSnapshot copy = reader.readKeyChainSnapshot(); assertThat(copy.getSnapshotVersion()).isEqualTo(SNAPSHOT_VERSION); - assertThat(copy.getKeyChainProtectionParams()).hasSize(2); + assertThat(copy.getKeyChainProtectionParams()).hasSize(1); assertThat(copy.getKeyChainProtectionParams().get(0).getUserSecretType()).isEqualTo(1); - assertThat(copy.getKeyChainProtectionParams().get(1).getUserSecretType()).isEqualTo(2); assertThat(copy.getEncryptedRecoveryKeyBlob()).isEqualTo(RECOVERY_KEY_MATERIAL); - assertThat(copy.getWrappedApplicationKeys()).hasSize(2); + assertThat(copy.getWrappedApplicationKeys()).hasSize(1); assertThat(copy.getWrappedApplicationKeys().get(0).getAlias()).isEqualTo(ALIAS); - assertThat(copy.getWrappedApplicationKeys().get(1).getAlias()).isEqualTo(ALIAS2); assertThat(copy.getMaxAttempts()).isEqualTo(MAX_ATTEMPTS); assertThat(copy.getCounterId()).isEqualTo(COUNTER_ID); assertThat(copy.getServerParams()).isEqualTo(SERVER_PARAMS); @@ -237,7 +234,6 @@ public class PersistentKeyChainSnapshotTest { verifyDeserialize(snapshot); } - @Ignore("Investigate why this is broken. b/73609806") @Test public void testKeyChainSnapshot_withManyKeysAndProtectionParams() throws Exception { PersistentKeyChainSnapshot writer = new PersistentKeyChainSnapshot(); @@ -272,7 +268,7 @@ public class PersistentKeyChainSnapshotTest { KeyChainSnapshot snapshot = new KeyChainSnapshot.Builder() .setSnapshotVersion(SNAPSHOT_VERSION) .setKeyChainProtectionParams(protectionParamsList) - .setEncryptedRecoveryKeyBlob(KEY_MATERIAL) + .setEncryptedRecoveryKeyBlob(RECOVERY_KEY_MATERIAL) .setWrappedApplicationKeys(appKeysList) .setMaxAttempts(MAX_ATTEMPTS) .setCounterId(COUNTER_ID)