summaryrefslogtreecommitdiff
path: root/icu4j/main
diff options
context:
space:
mode:
authorChristine Hallstrom <hallstrom@google.com>2018-03-07 16:41:40 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-03-07 16:41:40 +0000
commita45b9e59892661beb2f3da1f1bf49435ce842636 (patch)
treefb071ff34cf81d38b8bae581eb9866905b18cd1d /icu4j/main
parent723cb3d1c998d420945ed53de29c8017a600a2f2 (diff)
parentf650568179061c026ed31553feadbe437153f67c (diff)
downloadicu-a45b9e59892661beb2f3da1f1bf49435ce842636.tar.gz
Increase timeout for TransliteratorTest#TestSourceTargetSet2 am: 02a8b1c119android-o-mr1-iot-preview-7o-mr1-iot-preview-7
am: f650568179 Change-Id: If9c27c4602366acd2dcb5beb0ab16f3edafe5640
Diffstat (limited to 'icu4j/main')
-rw-r--r--icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/TransliteratorTest.java4
1 files changed, 3 insertions, 1 deletions
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 b71629448..648dc5c14 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
@@ -2989,7 +2989,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() {