diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-13 03:50:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-13 03:50:19 +0000 |
| commit | e9606387d7b8ecd2065108f48208d3c497f451fc (patch) | |
| tree | 9de43c5748a79d4b173643fa4000151953d657b6 | |
| parent | 2aef34c45209291f78d09018a00783d7ec959f4e (diff) | |
| parent | 8b36497875c3086037ca9d275a6f888d3aa53b36 (diff) | |
| download | okhttp-e9606387d7b8ecd2065108f48208d3c497f451fc.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 am: b6821f6df2 am: 8b36497875
Original change: https://android-review.googlesource.com/c/platform/external/okhttp/+/2059350
Change-Id: I736519c5348372bf2b31e6badd7da4466d4193e0
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.java | 2 |
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; |