From d2fd7a220d334e2feb38c5b800a821a79746ec26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Chris=20G=C3=B6llner?= <chrisgollner@google.com>
Date: Fri, 21 Jul 2023 11:01:30 +0000
Subject: [PATCH] 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.

Change-Id: Ic7c389084838e57008d7eb327e674ef6407975af
Fixes: 292206289
Merged-In: I86236180877f14273f2b59fc3d4b37529ed87c49
---
 packages/SystemUI/TEST_MAPPING | 30 ------------------------------
 1 file changed, 30 deletions(-)

diff --git a/packages/SystemUI/TEST_MAPPING b/packages/SystemUI/TEST_MAPPING
index bb8002a18c119..01e6bf00a664f 100644
--- a/packages/SystemUI/TEST_MAPPING
+++ b/packages/SystemUI/TEST_MAPPING
@@ -52,20 +52,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",
@@ -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"
-        }
-      ]
-    }
   ]
 }