summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-08 18:25:10 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-08 18:25:10 +0000
commit0753fed7b6ecb24af3640426573434bf43902478 (patch)
tree2822ca94c4f9527dfea5f7d7c6579c9a34777c65
parent39de121a7e81a1f399a1e83fee97591383546c88 (diff)
downloadchromium_src-0753fed7b6ecb24af3640426573434bf43902478.zip
chromium_src-0753fed7b6ecb24af3640426573434bf43902478.tar.gz
chromium_src-0753fed7b6ecb24af3640426573434bf43902478.tar.bz2
Mark two tests flaky.
They triy to use a timeout to reduce flakiness, but that only makes them fail less often; they are still not completely reliable. BUG=48562 Review URL: http://codereview.chromium.org/2901003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51867 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/debugger/devtools_remote_listen_socket_unittest.cc4
-rw-r--r--net/base/listen_socket_unittest.cc4
2 files changed, 6 insertions, 2 deletions
diff --git a/chrome/browser/debugger/devtools_remote_listen_socket_unittest.cc b/chrome/browser/debugger/devtools_remote_listen_socket_unittest.cc
index 79933fe..2fa5212 100644
--- a/chrome/browser/debugger/devtools_remote_listen_socket_unittest.cc
+++ b/chrome/browser/debugger/devtools_remote_listen_socket_unittest.cc
@@ -343,7 +343,9 @@ class DevToolsRemoteListenSocketTest: public PlatformTest {
scoped_refptr<DevToolsRemoteListenSocketTester> tester_;
};
-TEST_F(DevToolsRemoteListenSocketTest, ServerSend) {
+// This test is flaky; see comment in ::TestServerSend.
+// http://code.google.com/p/chromium/issues/detail?id=48562
+TEST_F(DevToolsRemoteListenSocketTest, FLAKY_ServerSend) {
tester_->TestServerSend();
}
diff --git a/net/base/listen_socket_unittest.cc b/net/base/listen_socket_unittest.cc
index f33ac3c..b38019d 100644
--- a/net/base/listen_socket_unittest.cc
+++ b/net/base/listen_socket_unittest.cc
@@ -319,6 +319,8 @@ TEST_F(ListenSocketTest, ClientSendLong) {
tester_->TestClientSendLong();
}
-TEST_F(ListenSocketTest, ServerSend) {
+// This test is flaky; see comment in ::TestServerSend.
+// http://code.google.com/p/chromium/issues/detail?id=48562
+TEST_F(ListenSocketTest, FLAKY_ServerSend) {
tester_->TestServerSend();
}