diff options
| author | Christine Hallstrom <hallstrom@google.com> | 2018-03-07 17:14:47 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-03-07 17:14:47 +0000 |
| commit | 30b48eb76d1928d32699995d93b3ff783d6a55d9 (patch) | |
| tree | 4d6d49cb2d4c5b4f826b45b5f0db3e7ce47a9f59 | |
| parent | dca3bfcef5286212c2e16c0c3ffb4101d40f30af (diff) | |
| parent | b3bf2f61439f11c87a4c1152930b411bcbe54ffc (diff) | |
| download | icu-30b48eb76d1928d32699995d93b3ff783d6a55d9.tar.gz | |
Increase timeout for TransliteratorTest#TestSourceTargetSet2 am: 02a8b1c119
am: b3bf2f6143
Change-Id: Ic273a32d206f4fc536e18c9f643eab98de54c780
| -rw-r--r-- | android_icu4j/src/main/tests/android/icu/dev/test/translit/TransliteratorTest.java | 4 | ||||
| -rw-r--r-- | icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/TransliteratorTest.java | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/android_icu4j/src/main/tests/android/icu/dev/test/translit/TransliteratorTest.java b/android_icu4j/src/main/tests/android/icu/dev/test/translit/TransliteratorTest.java index fdb046821..2ca3946d7 100644 --- a/android_icu4j/src/main/tests/android/icu/dev/test/translit/TransliteratorTest.java +++ b/android_icu4j/src/main/tests/android/icu/dev/test/translit/TransliteratorTest.java @@ -3093,7 +3093,9 @@ public class TransliteratorTest extends TestFmwk { } } - @Test + // Android-changed: Added an explicit timeout because it is too slow to run on some Wear devices + // with the default. http://b/65468170 + @Test(timeout = 3_000_000L) public void TestSourceTargetSet2() { diff --git a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/TransliteratorTest.java b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/TransliteratorTest.java index d4bb80695..7568717ef 100644 --- a/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/TransliteratorTest.java +++ b/icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/TransliteratorTest.java @@ -3090,7 +3090,9 @@ public class TransliteratorTest extends TestFmwk { } } - @Test + // Android-changed: Added an explicit timeout because it is too slow to run on some Wear devices + // with the default. http://b/65468170 + @Test(timeout = 3_000_000L) public void TestSourceTargetSet2() { |