commit e6bbd506b9cc1c8379ade8d2048f2a0c51c76eee
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Jul 17 12:12:00 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 17 12:12:00 2023 +0000
tree f27cc9a1a64dcf19d056638f43c2785be604e189
parent 9b8cbfa21648dc6010d8cc41d4791f3dd0353d82
parent 6424db7d763bf1cbe0b8cab7d813fbd2f405f196

Merge "Disable SystemUIGoogleScreenshotTests on main" into main

packages/SystemUI/TEST_MAPPING

diff --git a/packages/SystemUI/TEST_MAPPING b/packages/SystemUI/TEST_MAPPING
index 42a5c61..7a5a382 100644
--- a/packages/SystemUI/TEST_MAPPING
+++ b/packages/SystemUI/TEST_MAPPING
@@ -53,20 +53,6 @@
       ]
     },
     {
-      "name": "SystemUIGoogleScreenshotTests",
-      "options": [
-        {
-          "exclude-annotation": "org.junit.Ignore"
-        },
-        {
-          "exclude-annotation": "androidx.test.filters.FlakyTest"
-        },
-        {
-          "exclude-annotation": "android.platform.test.annotations.Postsubmit"
-        }
-      ]
-    },
-    {
       // TODO(b/251476085): Consider merging with SystemUIGoogleScreenshotTests (in U+)
       "name": "SystemUIGoogleBiometricsScreenshotTests",
       "options": [
@@ -145,21 +131,5 @@
         }
       ]
     }
-  ],
-  "postsubmit": [
-   {
-      "name": "SystemUIGoogleScreenshotTests",
-      "options": [
-        {
-            "exclude-annotation": "org.junit.Ignore"
-        },
-        {
-            "exclude-annotation": "android.platform.test.annotations.FlakyTest"
-        },
-        {
-            "include-annotation": "android.platform.test.annotations.Postsubmit"
-        }
-      ]
-    }
   ]
 }