aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-04-13 02:51:50 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-04-13 02:51:50 +0000
commitb6821f6df23b8e14376a358101956bf963eeeb23 (patch)
tree9de43c5748a79d4b173643fa4000151953d657b6
parent95122d4e474db181bcb58afdab6d54f7ec70d8c3 (diff)
parent102a74baba97155fd77a3ccb0c51ae18dacd1eb7 (diff)
downloadokhttp-b6821f6df23b8e14376a358101956bf963eeeb23.tar.gz
Merge "Merge "Merge "Merge "UPSTREAM: Increase test timeout for slow devices" into android11-tests-dev am: fbc842a7a8" into android12-tests-dev am: e55ad96827" into android12L-tests-dev am: b308b06472" am: 6549691b14 am: 102a74baba
Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2059350 Change-Id: Ie62ee893e877e37103ac9605758f3f3f66c4b15f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--okhttp-tests/src/test/java/com/squareup/okhttp/internal/DiskLruCacheTest.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/okhttp-tests/src/test/java/com/squareup/okhttp/internal/DiskLruCacheTest.java b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/DiskLruCacheTest.java
index bf6e158..f5cd63e 100644
--- a/okhttp-tests/src/test/java/com/squareup/okhttp/internal/DiskLruCacheTest.java
+++ b/okhttp-tests/src/test/java/com/squareup/okhttp/internal/DiskLruCacheTest.java
@@ -50,7 +50,7 @@ import static org.junit.Assert.fail;
public final class DiskLruCacheTest {
@Rule public final TemporaryFolder tempDir = new TemporaryFolder();
- @Rule public final Timeout timeout = new Timeout(30 * 1000);
+ @Rule public final Timeout timeout = new Timeout(60 * 1000);
private final FaultyFileSystem fileSystem = new FaultyFileSystem(FileSystem.SYSTEM);
private final int appVersion = 100;