commit b0a992a56398643b09f5bb8a97cb8b2c7ce2fb74
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Jul 26 23:57:04 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jul 26 23:57:04 2023 +0000
tree 0a9f7ad7b0d9de57935f2fd8f110faacce5d18b8
parent 4469f262544b0eb8174f53b3f7de85e234068eb6
parent 53d0b214c6c65f8edc37f0d828c56a582ff6711c

Merge "Add API getting list of assignable devices" into main

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) {