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

Commit 760ab3bf authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Exclude flaky tests from presubmit." into rvc-dev am: 3fe54949 

Change-Id: Ib284942ace58f1694d72c2736e630ec7223901a1
parents 08ac5855 3fe54949

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

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
      ],

      "options": [

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

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

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

      ]

    }

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

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

      "options": [

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

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

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

      ]

    }

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

+3 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
        {

            "name": "CtsJobSchedulerTestCases",

            "options": [

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

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

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

            ]
@@ -11,6 +12,7 @@ 
            "name": "FrameworksMockingServicesTests",

            "options": [

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

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

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

            ]

        },
@@ -18,6 +20,7 @@ 
            "name": "FrameworksServicesTests",

            "options": [

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

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

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

            ]

        }

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

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

      "options": [

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

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

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

      ]

    },
@@ -11,6 +12,7 @@ 
      "name": "FrameworksServicesTests",

      "options": [

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

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

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

      ]

    }

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

+3 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
    {

      "name": "CtsBatterySavingTestCases",

      "options": [

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

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

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

      ]
@@ -11,6 +12,7 @@ 
      "name": "FrameworksMockingServicesTests",

      "options": [

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

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

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

      ]

    },
@@ -18,6 +20,7 @@ 
      "name": "FrameworksServicesTests",

      "options": [

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

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

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

        {

          "exclude-filter": "com.android.server.power.PowerManagerServiceTest#testWakefulnessAwake_ShouldWakeUpWhenPluggedIn"