summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorgene@chromium.org <gene@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-17 23:38:08 +0000
committergene@chromium.org <gene@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-17 23:38:08 +0000
commitd8837b3a398dc2911d1f84bbf8e6bf36ed3109d0 (patch)
tree845277285644d656c98abdefbeec4cd787f52637 /net
parent04a3ce32f931b00147760b1fb878b606d4e9eff4 (diff)
downloadchromium_src-d8837b3a398dc2911d1f84bbf8e6bf36ed3109d0.zip
chromium_src-d8837b3a398dc2911d1f84bbf8e6bf36ed3109d0.tar.gz
chromium_src-d8837b3a398dc2911d1f84bbf8e6bf36ed3109d0.tar.bz2
Marking test DhcpProxyScriptAdapterFetcher.TimeoutDuringDhcp as FLAKY.
http://code.google.com/p/chromium/issues/detail?id=82988 BUG=82988 TEST=none TBR=gene@chromium.org Review URL: http://codereview.chromium.org/7019026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85695 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/proxy/dhcp_proxy_script_adapter_fetcher_win_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/proxy/dhcp_proxy_script_adapter_fetcher_win_unittest.cc b/net/proxy/dhcp_proxy_script_adapter_fetcher_win_unittest.cc
index b4b05f9..6c99c56 100644
--- a/net/proxy/dhcp_proxy_script_adapter_fetcher_win_unittest.cc
+++ b/net/proxy/dhcp_proxy_script_adapter_fetcher_win_unittest.cc
@@ -176,7 +176,7 @@ TEST(DhcpProxyScriptAdapterFetcher, NormalCaseURLInDhcp) {
EXPECT_EQ(GURL(kPacUrl), client.fetcher_->GetPacURL());
}
-TEST(DhcpProxyScriptAdapterFetcher, TimeoutDuringDhcp) {
+TEST(DhcpProxyScriptAdapterFetcher, FLAKY_TimeoutDuringDhcp) {
// Does a Fetch() with a long enough delay on accessing DHCP that the
// fetcher should time out. This is to test a case manual testing found,
// where under certain circumstances (e.g. adapter enabled for DHCP and