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

Commit 6f911a64 authored by Anna Zhuravleva's avatar Anna Zhuravleva
Browse files

Use androidx FlakyTest annotation for device tests. 

Platform_testing large test annotation is for
host side tests and restricted, device tests should use
androidx annotation.

Bug: 293837621
Test: presubmit
Change-Id: I835c4c837fa2074c937d7068f17c75467fb213dc
parent afcd2393

TEST_MAPPING

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

      "options": [

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

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

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

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

      ]

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

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

      "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 −2
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
      "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

+4 −8
Original line number Diff line number Diff line
@@ -3,8 +3,6 @@ 
        {

            "name": "CtsJobSchedulerTestCases",

            "options": [

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

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

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

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

            ]
@@ -13,18 +11,16 @@ 
            "name": "FrameworksMockingServicesTests",

            "options": [

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

                {"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.job"},

                {"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"}

            ]

        }

    ],

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

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

            "options": [

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

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

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

            ]

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

            "options": [

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

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

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

            ]

        }