From 39779eb324c7f70841485771bf165b9570409c5c Mon Sep 17 00:00:00 2001 From: Winson Chiu Date: Wed, 5 Aug 2020 21:43:46 +0000 Subject: [PATCH] Increase parsing comparison test timeouts The packageInfoEquality test case is hitting test timeout issues with the default 60000 ms timeout. The actual timeout reproduced during local testing was 56s, but that seems close enough to the default 60s that performance differences may account for the flakiness. This uses a conservative 4 minute timeout, which accounts for potential scaling with additional packages in newer releases. Test: atest com.android.server.pm.parsing.AndroidPackageParsingEquivalenceTest Change-Id: I63b2a768b69e0a4c264aa96ca3a3803c7ae9ff1d --- .../pm/parsing/AndroidPackageParsingEquivalenceTest.kt | 5 +++++ 1 file changed, 5 insertions(+) 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 9f9ec31f0c917..f96ebda676026 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 @@ -23,6 +23,8 @@ 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 @@ -31,6 +33,9 @@ import org.junit.Test @Presubmit class AndroidPackageParsingEquivalenceTest : AndroidPackageParsingTestBase() { + @get:Rule + val timeout = Timeout(4, TimeUnit.MINUTES) + @get:Rule val expect = Expect.create()