commit af228ddc075b636bcd23f7bfb15bd5c08499161a
author Vaibhav Devmurari <vdevmurari@google.com> Tue Aug 01 11:20:08 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 01 11:20:08 2023 +0000
tree 2fce364a12cf3795699964fe1db5808f61a8964d
parent 8b38bc8ab8a86b58b6e72b210890ae51d40d83d3
parent e9ce3097ac804c618b7c37db284e83e08a42b4b7

Merge "Disable flaky ShortcutLoggingTests" into main

services/tests/wmtests/src/com/android/server/policy/ShortcutLoggingTests.java

diff --git a/services/tests/wmtests/src/com/android/server/policy/ShortcutLoggingTests.java b/services/tests/wmtests/src/com/android/server/policy/ShortcutLoggingTests.java
index e474317..d6c821f 100644
--- a/services/tests/wmtests/src/com/android/server/policy/ShortcutLoggingTests.java
+++ b/services/tests/wmtests/src/com/android/server/policy/ShortcutLoggingTests.java
@@ -19,7 +19,8 @@
 import android.platform.test.annotations.Presubmit;
 import android.view.KeyEvent;
 
-import androidx.test.filters.SmallTest;
+import androidx.test.filters.FlakyTest;
+import androidx.test.filters.LargeTest;
 
 import com.android.internal.annotations.Keep;
 import com.android.server.input.KeyboardMetricsCollector.KeyboardLogEvent;
@@ -32,7 +33,7 @@
 import junitparams.Parameters;
 
 @Presubmit
-@SmallTest
+@LargeTest
 @RunWith(JUnitParamsRunner.class)
 public class ShortcutLoggingTests extends ShortcutKeyTestBase {
 
@@ -234,6 +235,7 @@
     }
 
     @Test
+    @FlakyTest(bugId = 293273386)
     @Parameters(method = "shortcutTestArguments")
     public void testShortcuts(String testName, int[] testKeys, KeyboardLogEvent expectedLogEvent,
             int expectedKey, int expectedModifierState) {