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

Commit 33e559a0 authored by Ian Kasprzak's avatar Ian Kasprzak Committed by Android (Google) Code Review
Browse files

Merge "[DO NOT MERGE] Disabled the following tests in TEST_MAPPING:... 

Merge "[DO NOT MERGE] Disabled the following tests in TEST_MAPPING: FrameworksCoreTests:android.view.textclassifier.TextClassifierTest#testSuggetsConversationActions_deduplicate CtsAppTestCases:android.app.cts.ServiceTest#testAppZygoteServices CtsAppTestCases:android.app.cts.SystemFeaturesTest#testLocationFeatures CtsProviderTestCases:android.provider.cts.MediaStore_Images_ThumbnailsTest" into stage-aosp-master
parents 18f96879 f997c75d

core/java/android/app/TEST_MAPPING

+8 −0
Original line number Diff line number Diff line
@@ -26,6 +26,14 @@ 
                    "include-filter": "com.android.server.appop"

                }

            ]

        },

	{

            "name": "FrameworksCoreTests",

            "options": [

                {

                    "exclude-filter": "android.view.textclassifier.TextClassifierTest#testSuggetsConversationActions_deduplicate"

                }

            ]

        }

    ],

    "postsubmit": [

core/java/android/provider/TEST_MAPPING

0 → 100644
+12 −0
Original line number Diff line number Diff line 
{

    "presubmit": [

        {

            "name": "CtsProviderTestCases",

            "options": [

                {

                    "exclude-filter": "android.provider.cts.MediaStore_Images_ThumbnailsTest"

                }

            ]

        }

    ]

}
 
 No newline at end of file

core/java/android/view/accessibility/TEST_MAPPING

+8 −0
Original line number Diff line number Diff line
@@ -32,6 +32,14 @@ 
          "exclude-annotation": "androidx.test.filters.FlakyTest"

        }

      ]

    },

    {

      "name": "FrameworksCoreTests",

      "options": [

        {

          "exclude-filter": "android.view.textclassifier.TextClassifierTest#testSuggetsConversationActions_deduplicate"

        }

      ]

    }

  ],

  "postsubmit": [

core/java/android/view/textclassifier/TEST_MAPPING

+8 −0
Original line number Diff line number Diff line
@@ -10,6 +10,14 @@ 
          "exclude-annotation": "androidx.test.filters.FlakyTest"

        }

      ]

    },

    {

      "name": "FrameworksCoreTests",

      "options": [

        {

          "exclude-filter": "android.view.textclassifier.TextClassifierTest#testSuggetsConversationActions_deduplicate"

        }

      ]

    }

  ]

}

services/accessibility/TEST_MAPPING

+8 −0
Original line number Diff line number Diff line
@@ -65,6 +65,14 @@ 
          "exclude-annotation": "androidx.test.filters.FlakyTest"

        }

      ]

    },

    {

      "name": "FrameworksCoreTests",

      "options": [

        {

          "exclude-filter": "android.view.textclassifier.TextClassifierTest#testSuggetsConversationActions_deduplicate"

        }

      ]

    }

  ],

  "postsubmit": [