Update expectations for charset and URL test failures.

Change-Id: I3ff901d56df34e29830efbcd6e5e2a619629a733

2 files changed, 19 insertions, 4 deletions

diff --git a/expectations/brokentests.txt b/expectations/brokentests.txt
index 213b519..de553a9 100644
--- a/expectations/brokentests.txt
+++ b/expectations/brokentests.txt
@@ -3,6 +3,25 @@
  */
 [
 {
+  description: "This test and testGetKeepAlive have been failing in our continuous build recently.",
+  names: [
+    "libcore.java.net.URLConnectionTest#testConnectTimeouts",
+    "libcore.java.net.URLConnectionTest#testGetKeepAlive"
+  ],
+  bug: 3441111
+},
+{
+  description: "on the RI, writing the two halves of the surrogate pair in separate writes
+          is an error because the CharsetEncoder doesn't remember it's half-way through a
+          surrogate pair across the two calls!",
+  result: EXEC_FAILED,
+  names: [
+    "libcore.java.nio.charset.CharsetEncoderTest#testCharsetEncoderSurrogatesBrokenByDesign_IGNORE_RI",
+    "libcore.java.nio.charset.CharsetEncoderTest#testCharsetEncoderSurrogatesBrokenByDesign_REPLACE_RI",
+    "libcore.java.nio.charset.CharsetEncoderTest#testCharsetEncoderSurrogatesBrokenByDesign_REPORT_RI   "
+  ]
+},
+{
   description: "We're retiring the security manager. Unfortunately, tests all over the place
                 need to check that they're secure, so they all fail when we refuse to install
                 a security manager. This suppresses all of these failures.",
diff --git a/expectations/knownfailures.txt b/expectations/knownfailures.txt
index fd74263..0337c4a 100644
--- a/expectations/knownfailures.txt
+++ b/expectations/knownfailures.txt
@@ -245,10 +245,6 @@
   modes: [ "host" ]
 },
 {
-  name: "libcore.java.net.URLConnectionTest#testConnectTimeouts",
-  bug: 3032900
-},
-{
   description: "Fails in CTS but passes under run-core-tests",
   result: EXEC_FAILED,
   name: "libcore.java.io.OldFileTest#test_deleteOnExit"