Merge "TEST_MAPPING: re-enable ScanningSettingsTest in presubmit" into main

71718190 · Lucas Henneman · Gerrit Code Review · f6b04110 · b7afa49e · 71718190
Commit 71718190 authored 11 months ago by Lucas Henneman Committed by Gerrit Code Review 11 months ago
--- a/location/TEST_MAPPING
+++ b/location/TEST_MAPPING
@@ -2,12 +2,7 @@
  "presubmit": [
    {
      "name": "CtsLocationFineTestCases",
-      "options": [
-          {
-             // TODO: Wait for test to deflake - b/293934372
-             "exclude-filter":"android.location.cts.fine.ScanningSettingsTest"
-          }
-      ]
+      "options": []
    },
    {
      "name": "CtsLocationCoarseTestCases"

--- a/services/core/java/com/android/server/power/batterysaver/TEST_MAPPING
+++ b/services/core/java/com/android/server/power/batterysaver/TEST_MAPPING
@@ -5,12 +5,7 @@
    },
    {
      "name": "CtsLocationFineTestCases",
-      "options": [
-          {
-             // TODO: Wait for test to deflake - b/293934372
-             "exclude-filter":"android.location.cts.fine.ScanningSettingsTest"
-          }
-      ]
+      "options": []
    },
    {
      "name": "CtsLocationNoneTestCases"