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

Commit b7833028 authored by Alex Buynytskyy's avatar Alex Buynytskyy Committed by Patrick Baumann
Browse files

Cleanup after test suite split. 

Bug: 238141698
Bug: 262254794
Test: presubmit
Change-Id: I3d99829a735bc09b52ef77d75d875ca547d53f01
Merged-In: I3d99829a735bc09b52ef77d75d875ca547d53f01
parent d4e51d10

TEST_MAPPING

+30 −0
Original line number Diff line number Diff line
@@ -15,6 +15,22 @@ 
      ]

    }

  ],

  "presubmit-pm": [

    {

      "name": "PackageManagerServiceServerTests",

      "options": [

        {

          "include-annotation": "android.platform.test.annotations.Presubmit"

        },

        {

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

        },

        {

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

        }

      ]

    }

  ],

  "presubmit": [

    {

      "name": "ManagedProvisioningTests",
@@ -167,6 +183,20 @@ 
         "exclude-annotation": "org.junit.Ignore"

       }

     ]

   },

   {

     "name": "PackageManagerServiceServerTests",

     "options": [

       {

         "include-annotation": "android.platform.test.annotations.Presubmit"

       },

       {

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

       },

       {

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

       }

     ]

   }

 ]

}

services/tests/servicestests/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ android_test { 
        "hamcrest-library",

        "servicestests-utils",

        "service-jobscheduler",

        "service-permission.impl",

        // TODO: remove once Android migrates to JUnit 4.12,

        // which provides assertThrows

        "testng",