Commit 25204dc5 authored by Makoto Shimazu's avatar Makoto Shimazu Committed by Commit Bot

Disable PreviewsBrowserTest.NoScriptPreviewsEnabled on Win/Mac

TBR=dougarnett@chromium.org

Bug: 779934, 773834
Change-Id: I40632e362538aee524161b5d1fa9bcd824273dfa
Reviewed-on: https://chromium-review.googlesource.com/746063Reviewed-by: default avatarMakoto Shimazu <shimazu@chromium.org>
Commit-Queue: Makoto Shimazu <shimazu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#512765}
parent 87f4947e
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include "base/command_line.h" #include "base/command_line.h"
#include "base/test/scoped_feature_list.h" #include "base/test/scoped_feature_list.h"
#include "build/build_config.h"
#include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser.h"
#include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/ui_test_utils.h" #include "chrome/test/base/ui_test_utils.h"
...@@ -77,10 +78,17 @@ IN_PROC_BROWSER_TEST_F(PreviewsBrowserTest, NoScriptPreviewsDisabled) { ...@@ -77,10 +78,17 @@ IN_PROC_BROWSER_TEST_F(PreviewsBrowserTest, NoScriptPreviewsDisabled) {
EXPECT_FALSE(noscript_css_requested()); EXPECT_FALSE(noscript_css_requested());
} }
// Flaky on Win/Mac. See crbug.com/779934 for detail.
#if defined(OS_MACOSX) || defined(OS_WIN)
#define MAYBE_NoScriptPreviewsEnabled DISABLED_NoScriptPreviewsEnabled
#else
#define MAYBE_NoScriptPreviewsEnabled NoScriptPreviewsEnabled
#endif
// Loads a webpage that has both script and noscript tags and also requests // Loads a webpage that has both script and noscript tags and also requests
// a script resource. Verifies that the noscript tag is evaluated and the // a script resource. Verifies that the noscript tag is evaluated and the
// script resource is not loaded. // script resource is not loaded.
IN_PROC_BROWSER_TEST_F(PreviewsBrowserTest, NoScriptPreviewsEnabled) { IN_PROC_BROWSER_TEST_F(PreviewsBrowserTest, MAYBE_NoScriptPreviewsEnabled) {
EnableNoScriptPreviews(); EnableNoScriptPreviews();
ui_test_utils::NavigateToURL(browser(), test_url()); ui_test_utils::NavigateToURL(browser(), test_url());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment