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

Commit 3796c4d6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Disable non-reboot tests" into udc-dev am: 5d6b4f96 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22298047



Change-Id: Ief956a2e4814e5c74fbcf46ed3af16ea3a777b34
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b0e2b890 5d6b4f96

services/tests/PackageManagerServiceTests/host/src/com/android/server/pm/test/SdCardEjectionTests.kt

+2 −10
Original line number Diff line number Diff line
@@ -57,7 +57,8 @@ class SdCardEjectionTests : BaseHostJUnit4Test() { 


        @Parameterized.Parameters(name = "reboot={0}")

        @JvmStatic

        fun parameters() = arrayOf(false, true)

        // TODO(b/275403538): re-enable non-reboot scenarios with better tracking of APK removal

        fun parameters() = arrayOf(/*false, */true)



        data class Volume(

            val diskId: String,
@@ -200,15 +201,6 @@ class SdCardEjectionTests : BaseHostJUnit4Test() { 
            // TODO: There must be a better way to prevent it from auto-mounting.

            removeVirtualDisk()

            device.reboot()

        } else {

            // Because PackageManager unmount scan is asynchronous, need to retry until the package

            // has been unloaded. This only has to be done in the non-reboot case. Reboot will

            // clear the data structure by its nature.

            retryUntilSuccess {

                // The compiler section will print the state of the physical APK

                HostUtils.packageSection(device, pkgName, sectionName = "Compiler stats")

                        .any { it.contains("Unable to find package: $pkgName") }

            }

        }

    }

services/tests/PackageManagerServiceTests/host/test-apps/Generic/Android.bp

+21 −6
Original line number Diff line number Diff line
@@ -24,30 +24,45 @@ package { 
android_test_helper_app {

    name: "PackageManagerTestAppStub",

    manifest: "AndroidManifestVersion1.xml",

    srcs: []

    srcs: [],

}



android_test_helper_app {

    name: "PackageManagerTestAppVersion1",

    manifest: "AndroidManifestVersion1.xml"

    manifest: "AndroidManifestVersion1.xml",

    srcs: [

        "src/**/*.kt",

    ],

}



android_test_helper_app {

    name: "PackageManagerTestAppVersion2",

    manifest: "AndroidManifestVersion2.xml"

    manifest: "AndroidManifestVersion2.xml",

    srcs: [

        "src/**/*.kt",

    ],

}



android_test_helper_app {

    name: "PackageManagerTestAppVersion3",

    manifest: "AndroidManifestVersion3.xml"

    manifest: "AndroidManifestVersion3.xml",

    srcs: [

        "src/**/*.kt",

    ],

}



android_test_helper_app {

    name: "PackageManagerTestAppVersion4",

    manifest: "AndroidManifestVersion4.xml"

    manifest: "AndroidManifestVersion4.xml",

    srcs: [

        "src/**/*.kt",

    ],

}



android_test_helper_app {

    name: "PackageManagerTestAppOriginalOverride",

    manifest: "AndroidManifestOriginalOverride.xml"

    manifest: "AndroidManifestOriginalOverride.xml",

    srcs: [

        "src/**/*.kt",

    ],

}