From 5770b6366c62f5531f55b91bf514ecb23d8955bc Mon Sep 17 00:00:00 2001 From: "ke.zhao" Date: Thu, 12 Sep 2019 15:12:47 +0800 Subject: Extend the Stress#mockALot() timeout for CTS. Low-performance phones may not be able to finish the test within 300s. Bug: 140516795 Test: OEM confirmed that they can pass CTS now. Change-Id: Iad30a8cb07b38054b490b7006d11908fc752a024 Merged-In: Iad30a8cb07b38054b490b7006d11908fc752a024 --- README.version | 1 + .../src/main/java/com/android/dx/mockito/tests/Stress.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/README.version b/README.version index a4a21f2..b39a85a 100644 --- a/README.version +++ b/README.version @@ -14,3 +14,4 @@ Local Modifications: Do not read Build.VERSION to allow non-standard Android distributions (Ia8c4ba4c82cd6f193c565f1bfe48faffc4aac08f) Temporarily ignore failing test (Ibf7b6c2eb05c5ff83f0817f9224369e20c0b775d) Restrict InspectClass to current thread. (Ic62951ff81bed60ac7512455fad65210e4b728a9, need upstreaming) + Extend timeout of Stress#mockALot() for CTS. (Iad30a8cb07b38054b490b7006d11908fc752a024) 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 573ed67..3ff9f8b 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 @@ -40,7 +40,7 @@ public class Stress { } } - @Test + @Test(timeout=600000) public void mockALot() { for (int i = 0; i < NUM_TESTS; i++) { if (i % 1024 == 0) { -- cgit v1.2.3