summaryrefslogtreecommitdiffstats
path: root/net/socket/ssl_server_socket_unittest.cc
diff options
context:
space:
mode:
authormathp@chromium.org <mathp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-05 14:01:15 +0000
committermathp@chromium.org <mathp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-05 14:01:15 +0000
commitc22b60145ba4eddf64a1823d991d3ffb4932b33a (patch)
tree5699308fc4dfa80f8b85f1a4a69e6689874d859c /net/socket/ssl_server_socket_unittest.cc
parent498e757ed7128a604bdbeab8f2b6d5ea0487bd29 (diff)
downloadchromium_src-c22b60145ba4eddf64a1823d991d3ffb4932b33a.zip
chromium_src-c22b60145ba4eddf64a1823d991d3ffb4932b33a.tar.gz
chromium_src-c22b60145ba4eddf64a1823d991d3ffb4932b33a.tar.bz2
Disable SSLServerSocketTest_ClientWriteAfterServerClose on Android
Failure documented in attached bug. TBR=wtc,jam NOTREECHECKS=true NOTRY=true BUG=381147 Review URL: https://codereview.chromium.org/313173011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275085 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/ssl_server_socket_unittest.cc')
-rw-r--r--net/socket/ssl_server_socket_unittest.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/net/socket/ssl_server_socket_unittest.cc b/net/socket/ssl_server_socket_unittest.cc
index d2863ff..9da10f6 100644
--- a/net/socket/ssl_server_socket_unittest.cc
+++ b/net/socket/ssl_server_socket_unittest.cc
@@ -477,11 +477,17 @@ TEST_F(SSLServerSocketTest, DataTransfer) {
EXPECT_EQ(0, memcmp(write_buf->data(), read_buf->data(), write_buf->size()));
}
+// Flaky on Android: http://crbug.com/381147
+#if defined(OS_ANDROID)
+#define MAYBE_ClientWriteAfterServerClose DISABLED_ClientWriteAfterServerClose
+#else
+#define MAYBE_ClientWriteAfterServerClose ClientWriteAfterServerClose
+#endif
// A regression test for bug 127822 (http://crbug.com/127822).
// If the server closes the connection after the handshake is finished,
// the client's Write() call should not cause an infinite loop.
// NOTE: this is a test for SSLClientSocket rather than SSLServerSocket.
-TEST_F(SSLServerSocketTest, ClientWriteAfterServerClose) {
+TEST_F(SSLServerSocketTest, MAYBE_ClientWriteAfterServerClose) {
Initialize();
TestCompletionCallback connect_callback;