| commit | ce32e2c127c8c3182754d6c086f439e62b031198 | [log] [tgz] |
|---|---|---|
| author | Eduard Olteanu <[email protected]> | Tue Sep 19 15:42:17 2023 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Tue Sep 19 15:42:17 2023 +0000 |
| tree | 94f25905cbb5b1f5f6fbc087e5224f2ff8cb9e87 | |
| parent | ecb8636406ec1c4c89e721e38d570e8c19bba866 [diff] | |
| parent | e678c7d33ac77ac656b1ea0cdba4a355ce134401 [diff] |
Merge "Increase mockALot timeout to 17 minutes" into android13-tests-dev am: e678c7d33a Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2744610 Change-Id: Id49221e1d7c9bbb1e283f43dedf961dbe07485af Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/dexmaker-mockito-tests/src/main/java/com/android/dx/mockito/tests/Stress.java b/dexmaker-mockito-tests/src/main/java/com/android/dx/mockito/tests/Stress.java index 6b96f13..63ea3f0 100644 --- a/dexmaker-mockito-tests/src/main/java/com/android/dx/mockito/tests/Stress.java +++ b/dexmaker-mockito-tests/src/main/java/com/android/dx/mockito/tests/Stress.java
@@ -42,7 +42,7 @@ } @LargeTest - @Test(timeout=600000) + @Test(timeout=1020000) public void mockALot() { for (int i = 0; i < NUM_TESTS; i++) { if (i % 1024 == 0) {