summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristine Hallstrom <hallstrom@google.com>2018-03-07 17:09:46 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-03-07 17:09:46 +0000
commitb3bf2f61439f11c87a4c1152930b411bcbe54ffc (patch)
treee2d3dd9578f4c4493487eece4ed30bf8c53a283f
parente29d06ea6a1a045152413efe5751b18ed3112092 (diff)
parent02a8b1c11932d6fc1af0bcf17a0bf452154a159a (diff)
downloadicu-b3bf2f61439f11c87a4c1152930b411bcbe54ffc.tar.gz
Increase timeout for TransliteratorTest#TestSourceTargetSet2
am: 02a8b1c119 Change-Id: If09110702bf1b4d438c933b75ff6867f43a0859f
-rw-r--r--android_icu4j/src/main/tests/android/icu/dev/test/translit/TransliteratorTest.java4
-rw-r--r--icu4j/main/tests/translit/src/com/ibm/icu/dev/test/translit/TransliteratorTest.java4
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() {