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

Commit 3e22b660 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 727e36ff 7fab2348

services/companion/java/com/android/server/companion/virtual/TEST_MAPPING

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
          "include-filter": "android.hardware.input.cts.tests"

        },

        {

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

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

        }

      ],

      "file_patterns": ["Virtual[^/]*\\.java"]

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

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

            "options": [

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

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

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

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

            ]

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

+2 −4
Original line number Diff line number Diff line
@@ -4,16 +4,14 @@ 
      "name": "CtsHardwareTestCases",

      "options": [

        {"include-filter": "com.android.hardware.lights"},

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

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

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

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

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

      ]

    },

    {

      "name": "FrameworksServicesTests",

      "options": [

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

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

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

      ]

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
                    "include-annotation": "com.android.cts.devicepolicy.annotations.LockSettingsTest"

                },

                {

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

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

                }

            ]

        }
@@ -20,7 +20,7 @@ 
                    "include-filter": "com.android.server.locksettings."

                },

                {

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

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

                }

            ]

        }

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

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

      "options": [

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

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

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

      ]

    }