diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-09-13 20:39:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-09-13 20:39:50 +0000 |
| commit | 14081cd0e4cd973bd1fa213632a52e6d2955fe28 (patch) | |
| tree | a1b813eb45f6a936c16267b86fee7c2c594d487a | |
| parent | eb0ac321a95951475ce48e3521e9e2b895ce7546 (diff) | |
| parent | f53c14723cf4190fd10def2445cc3f3a6de5b7c1 (diff) | |
| download | dexmaker-ndk-sysroot-r21.tar.gz | |
Merge "Extend the Stress#mockALot() timeout for CTS."ndk-sysroot-r21
| -rw-r--r-- | README.version | 1 | ||||
| -rw-r--r-- | dexmaker-mockito-tests/src/main/java/com/android/dx/mockito/tests/Stress.java | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/README.version b/README.version index d51834c..4de4834 100644 --- a/README.version +++ b/README.version @@ -15,4 +15,5 @@ Local Modifications: Temporarily ignore failing test (Ibf7b6c2eb05c5ff83f0817f9224369e20c0b775d) Restrict InspectClass to current thread. (Ic62951ff81bed60ac7512455fad65210e4b728a9, need upstreaming) Exclude Stress#mockALot from presubmit (Ic9a2927ffa07924bd759429e31c56dc1b71a826c) + Extend timeout of Stress#mockALot() for CTS. (Iad30a8cb07b38054b490b7006d11908fc752a024) Update to Mockito 2.25.0 and impl InlineMockMaker (29a8674036d345e4ec8635b1d38d8b2a4fe91980a, need upstreaming) 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 6687e1e..6b96f13 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 + @Test(timeout=600000) public void mockALot() { for (int i = 0; i < NUM_TESTS; i++) { if (i % 1024 == 0) { |