Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05c42154 authored by Dmitri Plotnikov's avatar Dmitri Plotnikov Committed by Android Build Cherrypicker Worker
Browse files

Avoid including com.android.server.power.stats in presubmit twice 

Bug: 282715698
Test: presubmit
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1814dffd1c6f9edc0115ac73a434263321d77db9)
Merged-In: Ifd0de818ee99dfd6e44750f9bff4a6a7ef1e6dd2
Change-Id: Ifd0de818ee99dfd6e44750f9bff4a6a7ef1e6dd2
parent 56479560

core/java/android/os/TEST_MAPPING

+14 −2
Original line number Diff line number Diff line
@@ -52,8 +52,20 @@ 
      ],

      "name": "FrameworksServicesTests",

      "options": [

        { "include-filter": "com.android.server.am.BatteryStatsServiceTest" },

        { "include-filter": "com.android.server.power.stats.BatteryStatsTests" }

        { "include-filter": "com.android.server.am.BatteryStatsServiceTest" }

      ]

    },

    {

      "file_patterns": [

        "BatteryStats[^/]*\\.java",

        "BatteryUsageStats[^/]*\\.java",

        "PowerComponents\\.java",

        "[^/]*BatteryConsumer[^/]*\\.java"

      ],

      "name": "FrameworksServicesTests",

      "options": [

        { "include-filter": "com.android.server.power.stats" },

        { "exclude-filter": "com.android.server.power.stats.BatteryStatsTests" }

      ]

    },

    {

services/core/java/com/android/server/power/TEST_MAPPING

+3 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
      "name": "FrameworksServicesTests",

      "options": [

        {"include-filter": "com.android.server.power"},

        {"exclude-filter": "com.android.server.power.BatteryStatsTests"},

        {"exclude-annotation": "android.platform.test.annotations.FlakyTest"},

        {"exclude-annotation": "androidx.test.filters.FlakyTest"}

      ]
@@ -38,7 +39,8 @@ 
    {

      "name": "FrameworksServicesTests",

      "options": [

        {"include-filter": "com.android.server.power"}

        {"include-filter": "com.android.server.power"},

        {"exclude-filter": "com.android.server.power.BatteryStatsTests"}

      ]

    }

  ]