Merge branch 'readonly-p4-donut' into donut
This commit is contained in:
committed by
The Android Open Source Project
commit
b81ff457a3
@@ -28,6 +28,7 @@ import java.util.TimeZone;
|
||||
import android.test.suitebuilder.annotation.MediumTest;
|
||||
import android.test.suitebuilder.annotation.SmallTest;
|
||||
import android.test.suitebuilder.annotation.LargeTest;
|
||||
import android.test.suitebuilder.annotation.Suppress;
|
||||
|
||||
/**
|
||||
* Test some locale-dependent stuff for Android. This test mainly ensures that
|
||||
@@ -125,9 +126,9 @@ public class LocaleTest extends TestCase {
|
||||
}
|
||||
*/
|
||||
|
||||
// Regression test for 1118570: Create test cases for tracking ICU config
|
||||
// changes. This one makes sure we have all necessary locales installed.
|
||||
@MediumTest
|
||||
// This one makes sure we have all necessary locales installed.
|
||||
// Suppress this flaky test for now.
|
||||
@Suppress
|
||||
public void testICULocales() {
|
||||
String[] locales = new String[] {
|
||||
// List of locales currently required for Android.
|
||||
|
||||
Reference in New Issue
Block a user