From 965124a09f25eec0d73fdd8956e32ea42318a585 Mon Sep 17 00:00:00 2001 From: oshima Date: Wed, 17 Jun 2015 09:40:51 -0700 Subject: [PATCH] Disable tests that are failing on msan bot BUG=501362 TBR=xunjeli@chromium.org TBR=kalman@chromium.org Review URL: https://codereview.chromium.org/1185773005 Cr-Commit-Position: refs/heads/master@{#334851} --- .../extension_request_limiting_throttle_browsertest.cc | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/chrome/browser/extensions/extension_request_limiting_throttle_browsertest.cc b/chrome/browser/extensions/extension_request_limiting_throttle_browsertest.cc index 4cc8efc00b99..85099c068e23 100644 --- a/chrome/browser/extensions/extension_request_limiting_throttle_browsertest.cc +++ b/chrome/browser/extensions/extension_request_limiting_throttle_browsertest.cc @@ -125,9 +125,16 @@ IN_PROC_BROWSER_TEST_F(ExtensionRequestLimitingThrottleBrowserTest, embedded_test_server()->port()))); } +// Fails on msan bot: crbug.com/501362. +#if defined(MEMORY_SANITIZER) +#define MAYBE_ThrottleRequest_Redirect DISABLED_ThrottleRequest_Redirect +#else +#define MAYBE_ThrottleRequest_Redirect ThrottleRequest_Redirect +#endif + // Tests that the redirected request is also being throttled. IN_PROC_BROWSER_TEST_F(ExtensionRequestLimitingThrottleBrowserTest, - ThrottleRequest_Redirect) { + MAYBE_ThrottleRequest_Redirect) { embedded_test_server()->RegisterRequestHandler( base::Bind(&HandleRequest, false, false)); // Issue a bunch of requests to a url which gets redirected to a new url that @@ -157,11 +164,18 @@ IN_PROC_BROWSER_TEST_F(ExtensionRequestLimitingThrottleBrowserTest, embedded_test_server()->port()))); } +// Fails on msan bot: crbug.com/501362. +#if defined(MEMORY_SANITIZER) +#define MAYBE_ThrottleRequest_RedirectCached DISABLED_ThrottleRequest_RedirectCached +#else +#define MAYBE_ThrottleRequest_RedirectCached ThrottleRequest_RedirectCached +#endif + // Tests that if the redirect (302) is served from cache, but the non-redirect // (503) is not, the extension throttle throttles the requests for the second // url. IN_PROC_BROWSER_TEST_F(ExtensionRequestLimitingThrottleBrowserTest, - ThrottleRequest_RedirectCached) { + MAYBE_ThrottleRequest_RedirectCached) { embedded_test_server()->RegisterRequestHandler( base::Bind(&HandleRequest, true, false)); ASSERT_NO_FATAL_FAILURE( -- 2.11.4.GIT