aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-10-04 15:07:57 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2023-10-04 15:07:57 +0000
commitfe4a9827f137cf71cddeca426711257934011973 (patch)
treecffb2775de399aa5190fccdbf00b26712d1931df
parent614bcb0d51851b22bf2896bfefc14abc6d4017c4 (diff)
parent8784ddf19f30846cb080bd743af2df6ca2cf04c7 (diff)
downloaddexmaker-fe4a9827f137cf71cddeca426711257934011973.tar.gz
Merge "Snap for 10900817 from 77fb7f77bd4162dfde9cab482fe7470240dd8a8c to sdk-release" into sdk-releaseplatform-tools-34.0.5
-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) {