summaryrefslogtreecommitdiffstats
path: root/net/socket/client_socket_pool_base_unittest.cc
diff options
context:
space:
mode:
authorbacker@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-23 15:37:59 +0000
committerbacker@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-23 15:37:59 +0000
commit4fe853ad8762cafb16801da04976a72e27c6e9f4 (patch)
tree70a6b367807547d64f4313dfbe6493f98aefa10b /net/socket/client_socket_pool_base_unittest.cc
parent3565c0493cc45db9bf0adab811532afe39608030 (diff)
downloadchromium_src-4fe853ad8762cafb16801da04976a72e27c6e9f4.zip
chromium_src-4fe853ad8762cafb16801da04976a72e27c6e9f4.tar.gz
chromium_src-4fe853ad8762cafb16801da04976a72e27c6e9f4.tar.bz2
Disable ClientSocketPoolBaseTest.RequestSocketsMultipleTimesDoesNothing
It's been flaking on XP. BUG=129364 TBR=willchan TEST=none Review URL: https://chromiumcodereview.appspot.com/10414082 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138478 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/client_socket_pool_base_unittest.cc')
-rw-r--r--net/socket/client_socket_pool_base_unittest.cc12
1 files changed, 11 insertions, 1 deletions
diff --git a/net/socket/client_socket_pool_base_unittest.cc b/net/socket/client_socket_pool_base_unittest.cc
index 3f9c4ec..078735e 100644
--- a/net/socket/client_socket_pool_base_unittest.cc
+++ b/net/socket/client_socket_pool_base_unittest.cc
@@ -3243,7 +3243,17 @@ TEST_F(ClientSocketPoolBaseTest, RequestSocketsSynchronousError) {
ASSERT_FALSE(pool_->HasGroup("a"));
}
-TEST_F(ClientSocketPoolBaseTest, RequestSocketsMultipleTimesDoesNothing) {
+// http://crbug.com/129364
+#if defined(OS_WIN)
+#define MAYBE_RequestSocketsMultipleTimesDoesNothing \
+ DISABLED_RequestSocketsMultipleTimesDoesNothing
+#else
+#define MAYBE_RequestSocketsMultipleTimesDoesNothing \
+ RequestSocketsMultipleTimesDoesNothing
+#endif
+
+TEST_F(ClientSocketPoolBaseTest,
+ MAYBE_RequestSocketsMultipleTimesDoesNothing) {
CreatePool(4, 4);
connect_job_factory_->set_job_type(TestConnectJob::kMockPendingJob);