Merge "Update Expectations File" into gingerbread
diff --git a/tests/expectations/knownfailures.txt b/tests/expectations/knownfailures.txt
index c7b25b2..6292d7a 100644
--- a/tests/expectations/knownfailures.txt
+++ b/tests/expectations/knownfailures.txt
@@ -2,24 +2,15 @@
/* These tests consistently fail on GRH78. */
{ name: "android.location.cts.GeocoderTest#testGetFromLocation" },
{ name: "android.location.cts.GeocoderTest#testGetFromLocationName" },
-{ name: "android.net.cts.ListeningPortsTest#testNoListeningUdp6Ports" },
{ name: "android.webkit.cts.WebSettingsTest#testSetAppCacheEnabled" },
{ name: "android.net.cts.SSLCertificateSocketFactoryTest" },
{
- description: "testGetDuration causes testOnKeyDown to fail for some reason",
- name: "android.widget.cts.VideoViewTest#testOnKeyDown"
-},
-
-{
description: "Flaky tests that need to be rewritten or deleted.",
names: [
"android.media.cts.MediaRecorderTest#testSetCamera",
"android.webkit.cts.CacheManagerTest#testCacheFile",
- "android.widget.cts.AutoCompleteTextViewTest#testOnFilterComplete",
- "android.util.cts.EventLogTest#testReadEvents",
- "android.util.cts.EventLogTest#testWriteEvent",
- "android.util.cts.EventLogTest#testWriteEventWithOversizeValue"
+ "android.widget.cts.AutoCompleteTextViewTest#testOnFilterComplete"
]
},
@@ -28,29 +19,17 @@
name: "android.provider.cts.MediaStore_Audio_Playlists_MembersTest"
},
-/* These tests pass when executed individually but fail when running CTS as a whole on GRH78. */
{
- name: "org.apache.harmony.luni.tests.internal.net.www.protocol.https.HttpsURLConnectionTest#testProxyConnection",
- bug: 3184701
-},
-{
- name: "org.apache.harmony.luni.tests.internal.net.www.protocol.https.HttpsURLConnectionTest#testProxyAuthConnection",
- bug: 3184701
-},
-{
- name: "org.apache.harmony.luni.tests.internal.net.www.protocol.https.HttpsURLConnectionTest#testConsequentProxyConnection",
- bug: 3184701
-},
-{
- name: "org.apache.harmony.luni.tests.internal.net.www.protocol.https.HttpsURLConnectionTest#testProxyAuthConnection_doOutput",
- bug: 3184701
-},
-{
- name: "org.apache.harmony.luni.tests.internal.net.www.protocol.https.HttpsURLConnectionTest#testProxyAuthConnectionFailed",
- bug: 3184701
-},
-{
- name: "org.apache.harmony.luni.tests.internal.net.www.protocol.https.HttpsURLConnectionTest#testProxyConnection_Not_Found_Response",
- bug: 3184701
+ description: "These tests pass when executed individually but fail when running CTS as a whole on GRH78.",
+ bug: 3184701,
+ names: [
+ "org.apache.harmony.luni.tests.internal.net.www.protocol.https.HttpsURLConnectionTest#testProxyConnection",
+ "org.apache.harmony.luni.tests.internal.net.www.protocol.https.HttpsURLConnectionTest#testProxyAuthConnection",
+ "org.apache.harmony.luni.tests.internal.net.www.protocol.https.HttpsURLConnectionTest#testConsequentProxyConnection",
+ "org.apache.harmony.luni.tests.internal.net.www.protocol.https.HttpsURLConnectionTest#testProxyAuthConnection_doOutput",
+ "org.apache.harmony.luni.tests.internal.net.www.protocol.https.HttpsURLConnectionTest#testProxyAuthConnectionFailed",
+ "org.apache.harmony.luni.tests.internal.net.www.protocol.https.HttpsURLConnectionTest#testProxyConnection_Not_Found_Response"
+ ]
}
+
]
