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

Commit 2263796c authored by Anna Zhuravleva's avatar Anna Zhuravleva Committed by Android (Google) Code Review
Browse files

Merge "Use androidx FlakyTest annotation for device tests." into main

parents b8fc9160 0bbf383f

core/java/android/app/TEST_MAPPING

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
            "name": "CtsAppOpsTestCases",

            "options": [

                {

                    "exclude-annotation": "android.platform.test.annotations.FlakyTest"

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

                }

            ]

        },

core/java/android/os/TEST_MAPPING

+0 −3
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 
      "name": "FrameworksVibratorCoreTests",

      "options": [

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

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

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

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

      ]
@@ -21,7 +20,6 @@ 
      "name": "FrameworksVibratorServicesTests",

      "options": [

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

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

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

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

      ]
@@ -34,7 +32,6 @@ 
      "name": "CtsVibratorTestCases",

      "options": [

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

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

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

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

      ]

core/java/android/service/notification/TEST_MAPPING

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

      "name": "CtsNotificationTestCases",

      "options": [

        {

          "exclude-annotation": "android.platform.test.annotations.FlakyTest"

        },

        {

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

        },
@@ -20,9 +17,6 @@ 
    {

      "name": "FrameworksUiServicesTests",

      "options": [

        {

          "exclude-annotation": "android.platform.test.annotations.FlakyTest"

        },

        {

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

        },

core/java/android/text/TEST_MAPPING

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
      "name": "CtsTextTestCases",

      "options": [

          {

              "exclude-annotation": "android.platform.test.annotations.FlakyTest"

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

          },

          {

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

core/java/com/android/internal/infra/TEST_MAPPING

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
      "name": "CtsRoleTestCases",

      "options": [

          {

              "exclude-annotation": "android.platform.test.annotations.FlakyTest"

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

          }

      ]

    },
@@ -15,7 +15,7 @@ 
            "include-filter": "android.permission.cts.PermissionControllerTest"

          },

          {

            "exclude-annotation": "android.platform.test.annotations.FlakyTest"

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

          }

      ]

    },