summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authormmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-10 21:26:20 +0000
committermmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-10 21:26:20 +0000
commit3d7c43f861956c50ff4d048601e9ebfcc139c9f7 (patch)
tree11684205d5640289f0f001595e8f75a2a6c625c5 /tools
parent0a5f42d99313fce0de6603d2eeb0adad4a1160de (diff)
downloadchromium_src-3d7c43f861956c50ff4d048601e9ebfcc139c9f7.zip
chromium_src-3d7c43f861956c50ff4d048601e9ebfcc139c9f7.tar.gz
chromium_src-3d7c43f861956c50ff4d048601e9ebfcc139c9f7.tar.bz2
Fix race in HttpNetworkTransactionSpdy2Test.BasicAuthSpdyProxy and
re-enable it on TSAN/Dr. Memory. Apply same fix to the corresponding Spdy 3 test. Issue was that the tests relied on never reading MockReadData could not be safely read not being read. The memory bots slow things down enough that it was being read, and causing a crash. Fixed the bad data, and corrected the ordering of events. BUG=130874 Review URL: https://chromiumcodereview.appspot.com/10704042 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145959 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
-rw-r--r--tools/valgrind/gtest_exclude/net_unittests.gtest-drmemory_win32.txt3
-rw-r--r--tools/valgrind/gtest_exclude/net_unittests.gtest-tsan_win32.txt3
2 files changed, 0 insertions, 6 deletions
diff --git a/tools/valgrind/gtest_exclude/net_unittests.gtest-drmemory_win32.txt b/tools/valgrind/gtest_exclude/net_unittests.gtest-drmemory_win32.txt
index 1f32bcd..f394610 100644
--- a/tools/valgrind/gtest_exclude/net_unittests.gtest-drmemory_win32.txt
+++ b/tools/valgrind/gtest_exclude/net_unittests.gtest-drmemory_win32.txt
@@ -23,9 +23,6 @@ ClientSocketPoolBaseTest.DisableCleanupTimer
# Flaky, see http://crbug.com/108422
SSLClientSocketTest.ConnectMismatched
-# Sometimes fails, see http://crbug.com/130874
-HttpNetworkTransactionSpdy2Test.BasicAuthSpdyProxy
-
##############################################################################
# TODO(rnk): The exclusions below should only apply to the full mode
# DrMemory bot.
diff --git a/tools/valgrind/gtest_exclude/net_unittests.gtest-tsan_win32.txt b/tools/valgrind/gtest_exclude/net_unittests.gtest-tsan_win32.txt
index fd0c9a6..93ff8bd 100644
--- a/tools/valgrind/gtest_exclude/net_unittests.gtest-tsan_win32.txt
+++ b/tools/valgrind/gtest_exclude/net_unittests.gtest-tsan_win32.txt
@@ -29,6 +29,3 @@ DnsConfigServiceTest.*GetSystemConfig
# Times out occasionally, http://crbug.com/124452
HostResolverImplTest.StartWithinCallback
-
-# Fails on most runs. http://crbug.com/130874
-HttpNetworkTransactionSpdy2Test.BasicAuthSpdyProxy