aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-04-13 01:07:28 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-04-13 01:07:28 +0000
commit8b86ce1a80ac8e22de1928399c9f7b5ce36f299b (patch)
tree144a1473f455f4ae4d136d94b8ca8f74928c5b69
parent4c2ad950064606bd9f987ac0c37307695def9d2a (diff)
parente55ad96827504d7676a27fc336163f30eb8f84c1 (diff)
downloadokhttp-8b86ce1a80ac8e22de1928399c9f7b5ce36f299b.tar.gz
Merge "Merge "UPSTREAM: Increase test timeout for slow devices" into android11-tests-dev am: fbc842a7a8" into android12-tests-dev am: e55ad96827
Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2059350 Change-Id: I64c502f56d4f015b3db0837b1a762698bf52fe2d 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;