From 0f5539b84ade1e286d6110aba9a9f13ad9c49a63 Mon Sep 17 00:00:00 2001
From: satayev <satayev@google.com>
Date: Tue, 8 Feb 2022 15:15:57 +0000
Subject: [PATCH] Ignore flaky ApexSystemServicesTestCases.

It seems depending on logcat output for signaling introduces a
persistent flakiness to the tests. Mark them @Ignore until a better
solution is available, which disables the tests on presubmit.

The test is still part of mts-core which shouldn't be ignoring these
test cases though.

Bug: 218368479
Test: presubmit
Change-Id: I154e7fecab044d1f6406b98be8e3873a6ff03c5e
---
 TEST_MAPPING                                                   | 3 +++
 .../src/com/android/server/ApexSystemServicesTestCases.java    | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/TEST_MAPPING b/TEST_MAPPING
index 81e4fcb33e07a..b43eb7e12170a 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -26,6 +26,9 @@
       "options": [
         {
           "exclude-annotation": "androidx.test.filters.FlakyTest"
+        },
+        {
+          "exclude-annotation": "org.junit.Ignore"
         }
       ]
     },
diff --git a/services/tests/apexsystemservices/src/com/android/server/ApexSystemServicesTestCases.java b/services/tests/apexsystemservices/src/com/android/server/ApexSystemServicesTestCases.java
index 10635a138eb96..503df97a329e0 100644
--- a/services/tests/apexsystemservices/src/com/android/server/ApexSystemServicesTestCases.java
+++ b/services/tests/apexsystemservices/src/com/android/server/ApexSystemServicesTestCases.java
@@ -31,6 +31,7 @@ import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test;
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.RuleChain;
@@ -80,6 +81,7 @@ public class ApexSystemServicesTestCases extends BaseHostJUnit4Test {
                 .doesNotContain("FakeApexSystemService onStart");
     }
 
+    @Ignore
     @Test
     public void testApexSystemServiceStarts() throws Exception {
         // Pre-install the apex
@@ -94,6 +96,7 @@ public class ApexSystemServicesTestCases extends BaseHostJUnit4Test {
                 .contains("FakeApexSystemService onStart");
     }
 
+    @Ignore
     @Test
     public void testInitOrder() throws Exception {
         // Pre-install the apex