aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-04-13 00:52:04 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2022-04-13 00:52:04 +0000
commite55ad96827504d7676a27fc336163f30eb8f84c1 (patch)
tree144a1473f455f4ae4d136d94b8ca8f74928c5b69
parent97604aa844f4e3f035ea9c164b1bc370902e116c (diff)
parentb1e47c27a9b07e06f80017fe353a8ada0440f203 (diff)
downloadokhttp-e55ad96827504d7676a27fc336163f30eb8f84c1.tar.gz
Merge "Merge "UPSTREAM: Increase test timeout for slow devices" into android11-tests-dev am: fbc842a7a8" into android12-tests-dev
-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;