commit 6fd2027e2c13b1cc6210aa388de6f2dda404c4f9
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Jan 27 00:05:59 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Jan 27 00:05:59 2023 +0000
tree 97683a30fb986135d2c186baac816e5abff2a98b
parent bb131e7b797c2ec71fce9695063e33f5a3353bf7
parent 2dc59d94234ace4a80f5fe33d4b2351435b50be9

Snap for 9531772 from 2dc59d94234ace4a80f5fe33d4b2351435b50be9 to tm-qpr3-release

Change-Id: I0424ee8538a445424f4b49180556ffe3024b02f6

platform/src/test/java/org/conscrypt/metrics/MetricsTest.java

diff --git a/platform/src/test/java/org/conscrypt/metrics/MetricsTest.java b/platform/src/test/java/org/conscrypt/metrics/MetricsTest.java
index a1288fc..2584469 100644
--- a/platform/src/test/java/org/conscrypt/metrics/MetricsTest.java
+++ b/platform/src/test/java/org/conscrypt/metrics/MetricsTest.java
@@ -20,6 +20,7 @@
 
 import android.util.StatsEvent;
 import org.conscrypt.TestUtils;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -30,6 +31,7 @@
 
     // Tests that ReflexiveEvent produces the same event as framework's.
     @Test
+    @Ignore // Ignore on CTS 12 only: b/259508875
     public void test_reflexiveEvent() throws Exception {
         TestUtils.assumeStatsLogAvailable();
 

repackaged/platform/src/test/java/com/android/org/conscrypt/metrics/MetricsTest.java

diff --git a/repackaged/platform/src/test/java/com/android/org/conscrypt/metrics/MetricsTest.java b/repackaged/platform/src/test/java/com/android/org/conscrypt/metrics/MetricsTest.java
index 739d684..2f053fe 100644
--- a/repackaged/platform/src/test/java/com/android/org/conscrypt/metrics/MetricsTest.java
+++ b/repackaged/platform/src/test/java/com/android/org/conscrypt/metrics/MetricsTest.java
@@ -21,6 +21,7 @@
 
 import android.util.StatsEvent;
 import com.android.org.conscrypt.TestUtils;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -34,6 +35,7 @@
 
     // Tests that ReflexiveEvent produces the same event as framework's.
     @Test
+    @Ignore // Ignore on CTS 12 only: b/259508875
     public void test_reflexiveEvent() throws Exception {
         TestUtils.assumeStatsLogAvailable();