Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Side by Side Diff: chrome/browser/dom_distiller/dom_distiller_viewer_source_browsertest.cc

Issue 1912953003: Disable flaky DomDistillerViewerSourceBrowserTest.PrefChange test on Linux. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <string.h> 5 #include <string.h>
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 506 matching lines...) Expand 10 before | Expand all | Expand 10 after
517 std::string result; 517 std::string result;
518 EXPECT_TRUE(content::ExecuteScriptAndExtractString( 518 EXPECT_TRUE(content::ExecuteScriptAndExtractString(
519 contents, kGetLoadIndicatorClassName, &result)); 519 contents, kGetLoadIndicatorClassName, &result));
520 EXPECT_EQ("hidden", result); 520 EXPECT_EQ("hidden", result);
521 EXPECT_TRUE(content::ExecuteScriptAndExtractString( 521 EXPECT_TRUE(content::ExecuteScriptAndExtractString(
522 contents, kGetContent , &result)); 522 contents, kGetContent , &result));
523 EXPECT_THAT(result, HasSubstr("Page 1 content")); 523 EXPECT_THAT(result, HasSubstr("Page 1 content"));
524 EXPECT_THAT(result, HasSubstr("Page 2 content")); 524 EXPECT_THAT(result, HasSubstr("Page 2 content"));
525 } 525 }
526 526
527 IN_PROC_BROWSER_TEST_F(DomDistillerViewerSourceBrowserTest, PrefChange) { 527 // Flaky on Ubuntu-12.04 bots: https://crbug.com/606037
528 #if defined(OS_LINUX)
529 #define MAYBE_PrefChange DISABLED_PrefChange
530 #else
531 #define MAYBE_PrefChange PrefChange
532 #endif
533 IN_PROC_BROWSER_TEST_F(DomDistillerViewerSourceBrowserTest,
534 MAYBE_PrefChange) {
528 PrefTest(false); 535 PrefTest(false);
529 } 536 }
530 537
531 #if defined(OS_LINUX) 538 #if defined(OS_LINUX)
532 // Flaky on Ubuntu-12.04 bots: https://crbug.com/604362 539 // Flaky on Ubuntu-12.04 bots: https://crbug.com/604362
533 #define MAYBE_PrefChangeError DISABLED_PrefChangeError 540 #define MAYBE_PrefChangeError DISABLED_PrefChangeError
534 #else 541 #else
535 #define MAYBE_PrefChangeError PrefChangeError 542 #define MAYBE_PrefChangeError PrefChangeError
536 #endif 543 #endif
537 IN_PROC_BROWSER_TEST_F(DomDistillerViewerSourceBrowserTest, 544 IN_PROC_BROWSER_TEST_F(DomDistillerViewerSourceBrowserTest,
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
645 EXPECT_EQ("dark serif", result); 652 EXPECT_EQ("dark serif", result);
646 EXPECT_EQ(kDarkToolbarThemeColor, contents->GetThemeColor()); 653 EXPECT_EQ(kDarkToolbarThemeColor, contents->GetThemeColor());
647 654
648 EXPECT_TRUE(content::ExecuteScriptAndExtractString( 655 EXPECT_TRUE(content::ExecuteScriptAndExtractString(
649 contents, kGetFontSize, &result)); 656 contents, kGetFontSize, &result));
650 base::StringToDouble(result, &fontSize); 657 base::StringToDouble(result, &fontSize);
651 ASSERT_FLOAT_EQ(kScale, fontSize/oldFontSize); 658 ASSERT_FLOAT_EQ(kScale, fontSize/oldFontSize);
652 } 659 }
653 660
654 } // namespace dom_distiller 661 } // namespace dom_distiller
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698