Merge commit 'goog/master' into merge_master

This commit is contained in:
Mathias Agopian
2009-04-14 15:21:33 -07:00

View File

@@ -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.