commit a3030444ecd7b134fa207f3ec4168a7655dffae3
author Vadim Tryshev <vadimt@google.com> Tue Sep 12 14:55:43 2023 -0700
committer Vadim Tryshev <vadimt@google.com> Thu Sep 14 23:07:07 2023 +0000
tree 254c47454e86b5c83be3f398774a9eac802e286f
parent 62e3b162bab91191e4ddf369c6dc55e61e551a99

If running in presubmit, ignore @PortraitLandscape annotation.
It's important to keep presubmits fast even if we will occasionally miss
regressions in presubmit.

Bug: 295939967
Test: presubmit
Flag: N/A
Change-Id: I9b65a2dc1e912fbfe834d7eee67815cb05f30bb2

tests/src/com/android/launcher3/ui/PortraitLandscapeRunner.java

diff --git a/tests/src/com/android/launcher3/ui/PortraitLandscapeRunner.java b/tests/src/com/android/launcher3/ui/PortraitLandscapeRunner.java
index f0875f8..ad11268 100644
--- a/tests/src/com/android/launcher3/ui/PortraitLandscapeRunner.java
+++ b/tests/src/com/android/launcher3/ui/PortraitLandscapeRunner.java
@@ -1,9 +1,12 @@
 package com.android.launcher3.ui;
 
+import static com.android.launcher3.util.rule.TestStabilityRule.PLATFORM_PRESUBMIT;
+
 import android.util.Log;
 import android.view.Surface;
 
 import com.android.launcher3.tapl.TestHelpers;
+import com.android.launcher3.util.rule.TestStabilityRule;
 
 import org.junit.rules.TestRule;
 import org.junit.runner.Description;
@@ -30,8 +33,12 @@
 
     @Override
     public Statement apply(Statement base, Description description) {
-        if (!TestHelpers.isInLauncherProcess() ||
-                description.getAnnotation(PortraitLandscape.class) == null) {
+        if (!TestHelpers.isInLauncherProcess()
+                || description.getAnnotation(PortraitLandscape.class) == null
+                // If running in presubmit, don't run in both orientations.
+                // It's important to keep presubmits fast even if we will occasionally miss
+                // regressions in presubmit.
+                || TestStabilityRule.getRunFlavor() == PLATFORM_PRESUBMIT) {
             return base;
         }