summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristine Hallstrom <hallstrom@google.com>2018-03-07 16:57:47 +0000
committerandroid-build-merger <android-build-merger@google.com>2018-03-07 16:57:47 +0000
commitf3ce40c1a919685d312d173101f82e17149f2be3 (patch)
tree82795cb55d46bcb79757d6a129175591d2818742
parent529c695aed8e1e79bc60a5d8870c18a8d69d5a8b (diff)
parent5d6ee8c5b171b5795b0970e958981b01c1c28b96 (diff)
downloadicu-f3ce40c1a919685d312d173101f82e17149f2be3.tar.gz
Increase timeout for TransliteratorTest#TestSourceTargetSet2 am: 02a8b1c119 am: f650568179
am: 5d6ee8c5b1 Change-Id: I5a7caec39a038db16392730cd1055f20b7aa4518
-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 d97a50d3c..8f72f4851 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
@@ -2992,7 +2992,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 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() {