From a35f212ffaaf9e0a95290f756b41a7023e6fc0ee Mon Sep 17 00:00:00 2001
From: Alan Stokes <alanstokes@google.com>
Date: Thu, 6 Apr 2023 10:24:07 +0100
Subject: [PATCH] Disable ComposTestCase on Cuttlefish

It is very flaky, with a high level of OOM errors both inside &
outside the VM. This doesn't seem to indicate a real problem, but
causes presubmit problems.

Also revert commit a6a67730f0e4190ddbf9d56cec9bc9274bdbb2c8 and move
the test back to our presubmit. If that is successful, we can then do
the same for other TEST_MAPPING files.

Bug: 264496291
Test: atest ComposHostTestCases
Change-Id: I2487f555c35ffdb5610efb67146922762ee170a4
---
 TEST_MAPPING                                              | 6 +++---
 compos/tests/java/android/compos/test/ComposTestCase.java | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/TEST_MAPPING b/TEST_MAPPING
index 3217ee19..d17b434a 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -3,6 +3,9 @@
     {
       "name": "MicrodroidHostTestCases"
     },
+    {
+      "name": "ComposHostTestCases"
+    },
     {
       "name": "MicrodroidTestApp"
     },
@@ -32,9 +35,6 @@
     {
       "name": "ComposBenchmarkApp"
     },
-    {
-      "name": "ComposHostTestCases"
-    },
     {
       "name": "AVFHostTestCases"
     }
diff --git a/compos/tests/java/android/compos/test/ComposTestCase.java b/compos/tests/java/android/compos/test/ComposTestCase.java
index eb2e072b..8c7aeeb6 100644
--- a/compos/tests/java/android/compos/test/ComposTestCase.java
+++ b/compos/tests/java/android/compos/test/ComposTestCase.java
@@ -23,6 +23,8 @@ import static com.android.tradefed.testtype.DeviceJUnit4ClassRunner.TestLogData;
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
 
+import static org.junit.Assume.assumeFalse;
+
 import android.platform.test.annotations.RootPermissionTest;
 
 import com.android.microdroid.test.host.CommandRunner;
@@ -81,6 +83,8 @@ public final class ComposTestCase extends MicrodroidHostTestCaseBase {
     @Before
     public void setUp() throws Exception {
         assumeDeviceIsCapable(getDevice());
+        // We get a very high level of (apparently bogus) OOM errors on Cuttlefish (b/264496291).
+        assumeFalse("Skipping test on Cuttlefish", isCuttlefish());
 
         String value = getDevice().getProperty(SYSTEM_SERVER_COMPILER_FILTER_PROP_NAME);
         if (value == null) {