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

Commit 46338bf9 authored by Julien Desprez's avatar Julien Desprez Committed by Automerger Merge Worker
Browse files

Merge "Move CtsUsageStatsTestCases to "presubmit" group only" am: 78fe90eb... 

Merge "Move CtsUsageStatsTestCases to "presubmit" group only" am: 78fe90eb am: 71625362 am: 7d00917d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2460179



Change-Id: If252385c0e0b3b61722167589b497afc87270c16
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 98ef23ed 7d00917d

apex/jobscheduler/service/java/com/android/server/usage/TEST_MAPPING

+1 −12
Original line number Original line Diff line number Diff line
@@ -4,6 +4,7 @@ 
      "name": "CtsUsageStatsTestCases",

      "name": "CtsUsageStatsTestCases",

      "options": [

      "options": [

        {"include-filter": "android.app.usage.cts.UsageStatsTest"},

        {"include-filter": "android.app.usage.cts.UsageStatsTest"},

        {"include-filter": "android.app.usage.cts.BroadcastResponseStatsTest"},

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

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

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

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

        {"exclude-annotation": "androidx.test.filters.MediumTest"},

        {"exclude-annotation": "androidx.test.filters.MediumTest"},
@@ -19,18 +20,6 @@ 
      ]

      ]

    }

    }

  ],

  ],

  "presubmit-large": [

    {

      "name": "CtsUsageStatsTestCases",

      "options": [

        {"include-filter": "android.app.usage.cts.BroadcastResponseStatsTest"},

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

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

        {"exclude-annotation": "androidx.test.filters.MediumTest"},

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

      ]

    }

  ],

  "postsubmit": [

  "postsubmit": [

    {

    {

      "name": "CtsUsageStatsTestCases"

      "name": "CtsUsageStatsTestCases"

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

+1 −3
Original line number Original line Diff line number Diff line
@@ -106,9 +106,7 @@ 
        { "exclude-annotation": "androidx.test.filters.FlakyTest" },

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

        { "exclude-annotation": "org.junit.Ignore" }

        { "exclude-annotation": "org.junit.Ignore" }

      ]

      ]

    }

    },

  ],

  "presubmit-large": [

    {

    {

      "name": "CtsUsageStatsTestCases",

      "name": "CtsUsageStatsTestCases",

      "file_patterns": [

      "file_patterns": [

services/usage/java/com/android/server/usage/TEST_MAPPING

+1 −3
Original line number Original line Diff line number Diff line
@@ -18,9 +18,7 @@ 
          "exclude-filter": "com.android.server.usage.StorageStatsServiceTest"

          "exclude-filter": "com.android.server.usage.StorageStatsServiceTest"

        }

        }

      ]

      ]

    }

    },

  ],

  "presubmit-large": [

    {

    {

      "name": "CtsUsageStatsTestCases",

      "name": "CtsUsageStatsTestCases",

      "options": [

      "options": [