summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authoreroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-05 07:08:49 +0000
committereroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-05 07:08:49 +0000
commite9a40d5e6a36a441b27f03fc280d423591e00339 (patch)
tree0a6b31cffc3a01e8af8c75130cb4f311d4cf42e1 /net
parentf6eeded10a75632e1bc5ecaad9be46553c4ab908 (diff)
downloadchromium_src-e9a40d5e6a36a441b27f03fc280d423591e00339.zip
chromium_src-e9a40d5e6a36a441b27f03fc280d423591e00339.tar.gz
chromium_src-e9a40d5e6a36a441b27f03fc280d423591e00339.tar.bz2
Disable a test which is causing an error under valgrind TSAN.
It looks like there is a problem with the test setup (BlockableProxyResolver tests a bool outside of a lock). I will fix that next. TBR=willchan Review URL: http://codereview.chromium.org/578011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38194 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/proxy/single_threaded_proxy_resolver_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/proxy/single_threaded_proxy_resolver_unittest.cc b/net/proxy/single_threaded_proxy_resolver_unittest.cc
index dc24935..f0f5976 100644
--- a/net/proxy/single_threaded_proxy_resolver_unittest.cc
+++ b/net/proxy/single_threaded_proxy_resolver_unittest.cc
@@ -221,7 +221,7 @@ TEST(SingleThreadedProxyResolverTest, Basic) {
// Tests that the LoadLog is updated to include the time the request was waiting
// to be scheduled to a thread.
-TEST(SingleThreadedProxyResolverTest, UpdatesLoadLogWithThreadWait) {
+TEST(SingleThreadedProxyResolverTest, DISABLED_UpdatesLoadLogWithThreadWait) {
BlockableProxyResolver* mock = new BlockableProxyResolver;
SingleThreadedProxyResolver resolver(mock);