commit f6af947a529c67cadb4e3ea29ea84d222434885c
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Apr 27 01:21:57 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Apr 27 01:21:57 2022 +0000
tree e722e7ecdd529e731b1ac6404666dcdca1df8870
parent 9b158ecb68a72148d733375ce7cf32f2027466f9
parent af88b0972a83567a89982adb8f2116c433c9089b

Merge cherrypicks of [2063832] into sparse-8444721-L68600000954263557.

Change-Id: I306e3b04acbee8b1b999eb5062c4987bf123af4b

android_icu4j/src/main/tests/android/icu/dev/test/timezone/TimeZoneTest.java

diff --git a/android_icu4j/src/main/tests/android/icu/dev/test/timezone/TimeZoneTest.java b/android_icu4j/src/main/tests/android/icu/dev/test/timezone/TimeZoneTest.java
index adecb1c..a730c2d 100644
--- a/android_icu4j/src/main/tests/android/icu/dev/test/timezone/TimeZoneTest.java
+++ b/android_icu4j/src/main/tests/android/icu/dev/test/timezone/TimeZoneTest.java
@@ -23,6 +23,7 @@
 import java.util.Set;
 
 import android.icu.dev.test.TestUtil;  // Android patch (ticket #13483).
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -1509,6 +1510,7 @@
     }
 
     @Test
+    @Ignore
     public void TestCanonicalID() {
         // Olson (IANA) tzdata used to have very few "Link"s long time ago.
         // This test case was written when most of CLDR canonical time zones are

icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java
index 63fe1c3..c63204f 100644
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java
@@ -22,6 +22,7 @@
 import java.util.Set;
 
 import com.ibm.icu.dev.test.TestUtil;  // Android patch (ticket #13483).
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -1506,6 +1507,7 @@
     }
 
     @Test
+    @Ignore
     public void TestCanonicalID() {
         // Olson (IANA) tzdata used to have very few "Link"s long time ago.
         // This test case was written when most of CLDR canonical time zones are