commit 5267a0475b18cb61b1bec8dee4118f9dd795e1b8
author Chris Göllner <chrisgollner@google.com> Thu Jul 20 13:33:28 2023 +0000
committer Chris Göllner <chrisgollner@google.com> Fri Jul 21 10:56:06 2023 +0000
tree c0525e63f2d20f8202251edf7b1b07d73aaa76b6
parent 6424db7d763bf1cbe0b8cab7d813fbd2f405f196

Enable SystemUIGoogleScreenshotTests on main and disable on udc-qpr-dev

At the moment the tests are only running on `udc-qpr-dev`, and not
on `main`.
If we disable them on `udc-qpr-dev` and keep them enabled on `main`,
they will still run in presubmits of both branches.

This way we also solve the problem of having potentially different
golden differences in both branches.

Fixes: 292206289
Change-Id: I86236180877f14273f2b59fc3d4b37529ed87c49

packages/SystemUI/TEST_MAPPING

diff --git a/packages/SystemUI/TEST_MAPPING b/packages/SystemUI/TEST_MAPPING
index 7a5a382..42a5c61 100644
--- a/packages/SystemUI/TEST_MAPPING
+++ b/packages/SystemUI/TEST_MAPPING
@@ -53,6 +53,20 @@
       ]
     },
     {
+      "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": [
@@ -131,5 +145,21 @@
         }
       ]
     }
+  ],
+  "postsubmit": [
+   {
+      "name": "SystemUIGoogleScreenshotTests",
+      "options": [
+        {
+            "exclude-annotation": "org.junit.Ignore"
+        },
+        {
+            "exclude-annotation": "android.platform.test.annotations.FlakyTest"
+        },
+        {
+            "include-annotation": "android.platform.test.annotations.Postsubmit"
+        }
+      ]
+    }
   ]
 }