summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorasvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-10 13:58:57 +0000
committerasvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-10 13:58:57 +0000
commit0a26df0e5b32f83932d2f1706f60c6d3f7d819d8 (patch)
tree643703e813a9a4797f78f08607aaf0ea26b81439
parent165e7f151d95fb61e3669fb252ef0612940d7d73 (diff)
downloadchromium_src-0a26df0e5b32f83932d2f1706f60c6d3f7d819d8.zip
chromium_src-0a26df0e5b32f83932d2f1706f60c6d3f7d819d8.tar.gz
chromium_src-0a26df0e5b32f83932d2f1706f60c6d3f7d819d8.tar.bz2
Mark DevToolsSanityTest.TestScriptsTabIsPopulatedOnInspectedPageRefresh flaky on Windows.
TBR=rlarocque@chromium.org BUG=141849 Review URL: https://chromiumcodereview.appspot.com/10828254 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151027 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/debugger/devtools_sanity_browsertest.cc10
1 files changed, 9 insertions, 1 deletions
diff --git a/chrome/browser/debugger/devtools_sanity_browsertest.cc b/chrome/browser/debugger/devtools_sanity_browsertest.cc
index fcb70b1..c063d32 100644
--- a/chrome/browser/debugger/devtools_sanity_browsertest.cc
+++ b/chrome/browser/debugger/devtools_sanity_browsertest.cc
@@ -420,9 +420,17 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestShowScriptsTab) {
// Tests that scripts tab is populated with inspected scripts even if it
// hadn't been shown by the moment inspected paged refreshed.
// @see http://crbug.com/26312
+#if defined(OS_WIN)
+// http://crbug.com/141849
+#define MAYBE_TestScriptsTabIsPopulatedOnInspectedPageRefresh \
+ FLAKY_TestScriptsTabIsPopulatedOnInspectedPageRefresh
+#else
+#define MAYBE_TestScriptsTabIsPopulatedOnInspectedPageRefresh \
+ TestScriptsTabIsPopulatedOnInspectedPageRefresh
+#endif
IN_PROC_BROWSER_TEST_F(
DevToolsSanityTest,
- TestScriptsTabIsPopulatedOnInspectedPageRefresh) {
+ MAYBE_TestScriptsTabIsPopulatedOnInspectedPageRefresh) {
// Clear inspector settings to ensure that Elements will be
// current panel when DevTools window is open.
content::GetContentClient()->browser()->ClearInspectorSettings(