aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEduard Olteanu <eduardolteanu@google.com>2023-09-19 16:39:49 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-09-19 16:39:49 +0000
commit10825f638df0566cc7257b536c77ee47e9df2258 (patch)
tree94f25905cbb5b1f5f6fbc087e5224f2ff8cb9e87
parent52f1a104981757b44fd5134d563ea0f0a158dab4 (diff)
parentce32e2c127c8c3182754d6c086f439e62b031198 (diff)
downloaddexmaker-10825f638df0566cc7257b536c77ee47e9df2258.tar.gz
Merge "Increase mockALot timeout to 17 minutes" into android13-tests-dev am: e678c7d33a am: ce32e2c127
Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2744610 Change-Id: I0198213862be812947fca6c4a1eabfa364c42d6e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--dexmaker-mockito-tests/src/main/java/com/android/dx/mockito/tests/Stress.java2
1 files changed, 1 insertions, 1 deletions
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 @@ public class Stress {
}
@LargeTest
- @Test(timeout=600000)
+ @Test(timeout=1020000)
public void mockALot() {
for (int i = 0; i < NUM_TESTS; i++) {
if (i % 1024 == 0) {