diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-30 20:17:28 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-30 20:17:28 +0000 |
| commit | 29100f0c586ee501b8ae4cf77e80412328615752 (patch) | |
| tree | 28e82978b83c28c2f337f482d4f5e5aa1c8d3192 | |
| parent | 05eaa3f6623635c30acf37bdc726201e9864d8cd (diff) | |
| parent | 437f3f87e2d5be872cf4da54b1d2c5e0b72aed82 (diff) | |
| download | conscrypt-29100f0c586ee501b8ae4cf77e80412328615752.tar.gz | |
Snap for 10579612 from 437f3f87e2d5be872cf4da54b1d2c5e0b72aed82 to android12L-tests-release
Change-Id: If490f2a40f90c7a556512f41436c7343ffabc943
| -rw-r--r-- | platform/src/test/java/org/conscrypt/TrustedCertificateStoreTest.java | 3 | ||||
| -rw-r--r-- | repackaged/platform/src/test/java/com/android/org/conscrypt/TrustedCertificateStoreTest.java | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/platform/src/test/java/org/conscrypt/TrustedCertificateStoreTest.java b/platform/src/test/java/org/conscrypt/TrustedCertificateStoreTest.java index d2095a32..679f6303 100644 --- a/platform/src/test/java/org/conscrypt/TrustedCertificateStoreTest.java +++ b/platform/src/test/java/org/conscrypt/TrustedCertificateStoreTest.java @@ -780,7 +780,8 @@ public class TrustedCertificateStoreTest extends TestCase { assertFalse(store.isUserAddedCertificate(getCa2())); } - public void testSystemCaCertsUseCorrectFileNames() throws Exception { + // TODO(b/293296163): re-enable once https://r.android.com/2675835 ships via Mainline. + private void dontTestSystemCaCertsUseCorrectFileNames() throws Exception { TrustedCertificateStore store = new TrustedCertificateStore(); // Assert that all the certificates in the system cacerts directory are stored in files with diff --git a/repackaged/platform/src/test/java/com/android/org/conscrypt/TrustedCertificateStoreTest.java b/repackaged/platform/src/test/java/com/android/org/conscrypt/TrustedCertificateStoreTest.java index c302f3af..40c136b0 100644 --- a/repackaged/platform/src/test/java/com/android/org/conscrypt/TrustedCertificateStoreTest.java +++ b/repackaged/platform/src/test/java/com/android/org/conscrypt/TrustedCertificateStoreTest.java @@ -784,7 +784,8 @@ public class TrustedCertificateStoreTest extends TestCase { assertFalse(store.isUserAddedCertificate(getCa2())); } - public void testSystemCaCertsUseCorrectFileNames() throws Exception { + // TODO(b/293296163): re-enable once https://r.android.com/2675835 ships via Mainline. + private void dontTestSystemCaCertsUseCorrectFileNames() throws Exception { TrustedCertificateStore store = new TrustedCertificateStore(); // Assert that all the certificates in the system cacerts directory are stored in files with |