Skip to content

Commit

Permalink
Disable two flaky extensions tests on ChromeOS
Browse files Browse the repository at this point in the history
This CL disable to extensions browser_tests that are flaky on ChromeOS
MSan bots.

TBR=thestig@chromium.org, xidachen@chromium.org
NOTRY=true

Bug: 836188
Change-Id: I0579a0129291a82a0818b31046cd946a469abd02
Reviewed-on: https://chromium-review.googlesource.com/1025755
Reviewed-by: Camille Lamy <clamy@chromium.org>
Commit-Queue: Camille Lamy <clamy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#553061}
  • Loading branch information
clamy authored and Commit Bot committed Apr 24, 2018
1 parent 961ef18 commit 140e385
Showing 1 changed file with 15 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,15 @@ IN_PROC_BROWSER_TEST_F(ExtensionRequestLimitingThrottleBrowserTest,
embedded_test_server()->port())));
}

#if defined(OS_CHROMEOS)
// Flaky: https://crbug.com/836188.
#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));
ASSERT_TRUE(embedded_test_server()->Start());
Expand Down Expand Up @@ -194,11 +200,18 @@ IN_PROC_BROWSER_TEST_F(ExtensionRequestLimitingThrottleBrowserTest,
embedded_test_server()->port())));
}

#if defined(OS_CHROMEOS)
// Flaky: https://crbug.com/836188.
#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_TRUE(embedded_test_server()->Start());
Expand Down

0 comments on commit 140e385

Please sign in to comment.