aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPete Bentley <prb@google.com>2023-01-25 18:43:37 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-01-25 18:43:37 +0000
commit37f8268eda09d6e97e7ac916bba82166f2fc7a95 (patch)
tree198a41b041605477307a99c7fbbfdc4edf9b7991
parent05157206e41a43f0418e9bda15c2fcc8e38c925a (diff)
parentf28b71b4255f31635ee2afdde3b5a893a29573ae (diff)
downloadconscrypt-37f8268eda09d6e97e7ac916bba82166f2fc7a95.tar.gz
[DO NOT MERGE] Ignore MetricsTest on CTS 13. am: f28b71b425
Original change: https://android-review.googlesource.com/c/platform/external/conscrypt/+/2355884 Change-Id: Iaa98fcd836f597d0df9a7e3f9c89e68d48972615 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--platform/src/test/java/org/conscrypt/metrics/MetricsTest.java2
-rw-r--r--repackaged/platform/src/test/java/com/android/org/conscrypt/metrics/MetricsTest.java2
2 files changed, 4 insertions, 0 deletions
diff --git a/platform/src/test/java/org/conscrypt/metrics/MetricsTest.java b/platform/src/test/java/org/conscrypt/metrics/MetricsTest.java
index a1288fc4..25844696 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 static org.junit.Assert.assertEquals;
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 @@ public class MetricsTest {
// 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();
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 739d684f..2f053fe0 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 static org.junit.Assert.assertEquals;
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 @@ public class MetricsTest {
// 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();