commit bf37bf9133f57ad357375a27691114f3ed439739
author Vinit Nayak <peanutbutter@google.com> Fri Apr 17 07:13:28 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Apr 17 07:13:28 2020 +0000
tree 27cfee7a4bbbfacac9cb4c3c4ddb64e1f8653120
parent ea883c2f5e2b885ed6edbb10ea6385b0f7fec5a4
parent 0d2d1e453f5961227babf08da96b63eb5f7b9b81

Merge "Disabling flaky test until fix is found" into rvc-dev am: b20995ba8e am: 9b89554da4 am: 0d2d1e453f

Change-Id: I4cb519e0e9f998844e8d5227c4535810f4e55d6c

quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java

diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
index 75fcfe2..9aa9f4c 100644
--- a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
+++ b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java
@@ -23,6 +23,7 @@
 import static org.junit.Assert.assertTrue;
 
 import android.content.Intent;
+import android.os.Build;
 
 import androidx.test.filters.LargeTest;
 import androidx.test.runner.AndroidJUnit4;
@@ -233,6 +234,9 @@
     @Test
     @PortraitLandscape
     public void testAllAppsFromHome() throws Exception {
+        // b/150958400
+        if (Build.MODEL.contains("Cuttlefish")) return;
+
         // Test opening all apps
         assertNotNull("switchToAllApps() returned null",
                 mLauncher.getWorkspace().switchToAllApps());