| commit | 4b390dc11578f625e1f0b7fe9bddd6eb689c06d3 | [log] [tgz] |
|---|---|---|
| author | Yuyang Huang <yuyanghuang@google.com> | Thu Jun 13 08:36:14 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 13 08:36:14 2024 +0000 |
| tree | c9e3f426411f0f04fbcc9002c03165caa2846978 | |
| parent | b1f89da5c3cd672848c8ef5c427ff813e0b5eaf8 [diff] | |
| parent | b26b437dea53f4954819265e9a71e37b7b85edcf [diff] |
Merge "Increase testReadWriteProgram() timeout to 15 minutes" into main am: b26b437dea Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3127833 Change-Id: Iac4eaff73c9aab5f7d45a079357d4defcad40570 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tests/cts/net/src/android/net/cts/ApfIntegrationTest.kt b/tests/cts/net/src/android/net/cts/ApfIntegrationTest.kt index 0b6637d..086f0e7 100644 --- a/tests/cts/net/src/android/net/cts/ApfIntegrationTest.kt +++ b/tests/cts/net/src/android/net/cts/ApfIntegrationTest.kt
@@ -361,7 +361,8 @@ @SkipPresubmit(reason = "This test takes longer than 1 minute, do not run it on presubmit.") // APF integration is mostly broken before V, only run the full read / write test on V+. @IgnoreUpTo(Build.VERSION_CODES.UPSIDE_DOWN_CAKE) - @Test + // Increase timeout for test to 15 minutes to accommodate device with large APF RAM. + @Test(timeout = 15 * 60 * 1000) fun testReadWriteProgram() { assumeApfVersionSupportAtLeast(4)