From a131d53bad1c3dbeb1baa8856d59a5d0c95e7898 Mon Sep 17 00:00:00 2001 From: Winson Date: Tue, 18 Aug 2020 09:16:01 -0700 Subject: [PATCH] Move package parsing equivalence tests to postsubmit It can't be guaranteed that these run under the 1 minute presubmit timeout limit. Now that R is branched, it should be safe to move these to postsubmit, as the original purpose of validating the new R parsing logic is now fulfilled. Also removes the timeout added in a previous change, since it's not necessary for postsubmit. Test: atest com.android.server.pm.parsing Bug: 165227202 Change-Id: I337257f385798818cba06fcad64cc4720932ff1c --- .../pm/parsing/AndroidPackageInfoFlagBehaviorTest.kt | 4 ++-- .../pm/parsing/AndroidPackageParsingEquivalenceTest.kt | 10 ++-------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/services/tests/servicestests/src/com/android/server/pm/parsing/AndroidPackageInfoFlagBehaviorTest.kt b/services/tests/servicestests/src/com/android/server/pm/parsing/AndroidPackageInfoFlagBehaviorTest.kt index 946f27e09fdbc..d36dcce800ebb 100644 --- a/services/tests/servicestests/src/com/android/server/pm/parsing/AndroidPackageInfoFlagBehaviorTest.kt +++ b/services/tests/servicestests/src/com/android/server/pm/parsing/AndroidPackageInfoFlagBehaviorTest.kt @@ -20,7 +20,7 @@ import android.content.pm.ApplicationInfo import android.content.pm.PackageInfo import android.content.pm.PackageManager import android.content.pm.PackageParser -import android.platform.test.annotations.Presubmit +import android.platform.test.annotations.Postsubmit import com.android.server.pm.parsing.AndroidPackageInfoFlagBehaviorTest.Companion.Param.Companion.appInfo import com.android.server.pm.parsing.AndroidPackageInfoFlagBehaviorTest.Companion.Param.Companion.pkgInfo import com.android.server.pm.parsing.pkg.AndroidPackage @@ -38,7 +38,7 @@ import org.junit.runners.Parameterized * This test has to be updated manually whenever the info generation behavior changes, since * there's no single place where flag -> field is defined besides this test. */ -@Presubmit +@Postsubmit @RunWith(Parameterized::class) class AndroidPackageInfoFlagBehaviorTest : AndroidPackageParsingTestBase() { diff --git a/services/tests/servicestests/src/com/android/server/pm/parsing/AndroidPackageParsingEquivalenceTest.kt b/services/tests/servicestests/src/com/android/server/pm/parsing/AndroidPackageParsingEquivalenceTest.kt index f96ebda676026..574921cdbd052 100644 --- a/services/tests/servicestests/src/com/android/server/pm/parsing/AndroidPackageParsingEquivalenceTest.kt +++ b/services/tests/servicestests/src/com/android/server/pm/parsing/AndroidPackageParsingEquivalenceTest.kt @@ -17,25 +17,19 @@ package com.android.server.pm.parsing import android.content.pm.PackageManager -import android.platform.test.annotations.Presubmit +import android.platform.test.annotations.Postsubmit import androidx.test.filters.LargeTest import com.google.common.truth.Expect - import org.junit.Rule import org.junit.Test -import org.junit.rules.Timeout -import java.util.concurrent.TimeUnit /** * Collects APKs from the device and verifies that the new parsing behavior outputs * the same exposed Info object as the old parsing logic. */ -@Presubmit +@Postsubmit class AndroidPackageParsingEquivalenceTest : AndroidPackageParsingTestBase() { - @get:Rule - val timeout = Timeout(4, TimeUnit.MINUTES) - @get:Rule val expect = Expect.create()