diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-18 00:12:10 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-18 00:12:10 +0000 |
| commit | a9d4333d8c74e69dcdf8cc7d16c6a4c8567c3889 (patch) | |
| tree | 4450987f700c4455e14f38266536eca97b110a27 /net/proxy | |
| parent | 2e2cda5187971c2e253d4da15c689ef5062f228d (diff) | |
| download | chromium_src-a9d4333d8c74e69dcdf8cc7d16c6a4c8567c3889.zip chromium_src-a9d4333d8c74e69dcdf8cc7d16c6a4c8567c3889.tar.gz chromium_src-a9d4333d8c74e69dcdf8cc7d16c6a4c8567c3889.tar.bz2 | |
Mark several tests that seem flaky under TSAN.
BUG=82991
TEST=none
TBR=eroman@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85700 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy')
| -rw-r--r-- | net/proxy/dhcp_proxy_script_adapter_fetcher_win_unittest.cc | 4 | ||||
| -rw-r--r-- | net/proxy/dhcp_proxy_script_fetcher_win_unittest.cc | 6 |
2 files changed, 7 insertions, 3 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 6c99c56..afb9377 100644 --- a/net/proxy/dhcp_proxy_script_adapter_fetcher_win_unittest.cc +++ b/net/proxy/dhcp_proxy_script_adapter_fetcher_win_unittest.cc @@ -156,7 +156,9 @@ class FetcherClient { string16 pac_text_; }; -TEST(DhcpProxyScriptAdapterFetcher, NormalCaseURLNotInDhcp) { +// Seems to be flaky under TSAN. +// http://crbug.com/82991 +TEST(DhcpProxyScriptAdapterFetcher, FLAKY_NormalCaseURLNotInDhcp) { FetcherClient client; client.fetcher_->configured_url_ = ""; client.RunTest(); diff --git a/net/proxy/dhcp_proxy_script_fetcher_win_unittest.cc b/net/proxy/dhcp_proxy_script_fetcher_win_unittest.cc index 596e298..9a8bab5 100644 --- a/net/proxy/dhcp_proxy_script_fetcher_win_unittest.cc +++ b/net/proxy/dhcp_proxy_script_fetcher_win_unittest.cc @@ -499,12 +499,14 @@ void TestShortCircuitLessPreferredAdapters(FetcherClient* client) { ASSERT_GT(TimeDelta::FromMilliseconds(23), timer.Elapsed()); } -TEST(DhcpProxyScriptFetcherWin, ShortCircuitLessPreferredAdapters) { +// Seems to be flaky under TSAN. http://crbug.com/82991 +TEST(DhcpProxyScriptFetcherWin, FLAKY_ShortCircuitLessPreferredAdapters) { FetcherClient client; TestShortCircuitLessPreferredAdapters(&client); } -TEST(DhcpProxyScriptFetcherWin, ReuseFetcher) { +// Seems to be flaky under TSAN. http://crbug.com/82991 +TEST(DhcpProxyScriptFetcherWin, FLAKY_ReuseFetcher) { FetcherClient client; // The ProxyScriptFetcher interface stipulates that only a single |