aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-04-13 01:22:10 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-04-13 01:22:10 +0000
commit8fcb6bce206f22d850482b880c13533d87e0a960 (patch)
tree9de43c5748a79d4b173643fa4000151953d657b6
parentb88f171140a2244c9071181ff617a4bc4cfaf12e (diff)
parentb308b0647260e92b03c3218d881d01fc824c6cc6 (diff)
downloadokhttp-8fcb6bce206f22d850482b880c13533d87e0a960.tar.gz
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
Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2059350 Change-Id: I289716aa1d1d3015089379c2122ee4a12d3f6d58 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;