commit 4469f262544b0eb8174f53b3f7de85e234068eb6
author Alan Stokes <alanstokes@google.com> Tue Jul 25 12:13:01 2023 +0000
committer Alan Stokes <alanstokes@google.com> Tue Jul 25 15:51:35 2023 +0000
tree 6a4c2dbcb0d084b6e3b26047706ba385d511da9d
parent 76beee13636f16ec1eec4d72264d2ec5a0277788

Revert "Revert "Disable ComposTestCase on Cuttlefish""

This reverts commit 35e8751f27df2964c7f8547ae1a203c84c9c6f69.

Reason for revert: Test is taking too long when run in presubmit on CF.

Change-Id: Idedf0f01f8186612f3151777fbf0a5e0956453dd
Bug: 292824951
Bug: 289619867

TEST_MAPPING

diff --git a/TEST_MAPPING b/TEST_MAPPING
index e2cf9a5..323b827 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -6,6 +6,9 @@
       "name": "MicrodroidHostTestCases"
     },
     {
+      "name": "ComposHostTestCases"
+    },
+    {
       "name": "MicrodroidTestApp"
     },
     {
@@ -35,9 +38,6 @@
       "name": "ComposBenchmarkApp"
     },
     {
-      "name": "ComposHostTestCases"
-    },
-    {
       "name": "AVFHostTestCases"
     }
   ],

compos/tests/java/android/compos/test/ComposTestCase.java

diff --git a/compos/tests/java/android/compos/test/ComposTestCase.java b/compos/tests/java/android/compos/test/ComposTestCase.java
index 1cebd1a..244d34e 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.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 @@
     @Before
     public void setUp() throws Exception {
         assumeDeviceIsCapable(getDevice());
+        // Test takes too long to run on Cuttlefish (b/292824951).
+        assumeFalse("Skipping test on Cuttlefish", isCuttlefish());
 
         String value = getDevice().getProperty(SYSTEM_SERVER_COMPILER_FILTER_PROP_NAME);
         if (value == null) {