Merge "Move biometric screenshot TEST_MAPPING to project root."

2022-12-13 18:32:19 +00:00
parent e466b56f13 3ca3211829
commit b7e6d6ff70
2 changed files with 12 additions and 16 deletions
--- a/packages/SystemUI/TEST_MAPPING
+++ b/packages/SystemUI/TEST_MAPPING
@@ -32,6 +32,18 @@
        }
      ]
    },
+    {
+      // TODO(b/251476085): Consider merging with SystemUIGoogleScreenshotTests (in U+)
+      "name": "SystemUIGoogleBiometricsScreenshotTests",
+      "options": [
+        {
+          "exclude-annotation": "org.junit.Ignore"
+        },
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        }
+      ]
+    },
    {
      // Permission indicators
      "name": "CtsPermission4TestCases",
--- a/packages/SystemUI/src/com/android/systemui/biometrics/TEST_MAPPING
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/TEST_MAPPING
@@ -1,16 +0,0 @@
-{
-  "presubmit": [
-    {
-      // TODO(b/251476085): Consider merging with SystemUIGoogleScreenshotTests (in U+)
-      "name": "SystemUIGoogleBiometricsScreenshotTests",
-      "options": [
-        {
-          "exclude-annotation": "org.junit.Ignore"
-        },
-        {
-          "exclude-annotation": "androidx.test.filters.FlakyTest"
-        }
-      ]
-    }
-  ]
-}