Commit 143ef2a2 authored by Joshua Pawlicki's avatar Joshua Pawlicki Committed by Commit Bot

Disable PrintPreviewDialogControllerBrowserTest.* on Linux.

TBR=rbpotter@chromium.org

Bug: 1021545
Change-Id: I50c82dbae1ba6ebc08fcbbfa478b2d15bbe126bd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1899308Reviewed-by: default avatarJoshua Pawlicki <waffles@chromium.org>
Commit-Queue: Joshua Pawlicki <waffles@chromium.org>
Cr-Commit-Position: refs/heads/master@{#712625}
parent bf3139b1
...@@ -221,10 +221,16 @@ class PrintPreviewDialogControllerBrowserTest : public InProcessBrowserTest { ...@@ -221,10 +221,16 @@ class PrintPreviewDialogControllerBrowserTest : public InProcessBrowserTest {
DISALLOW_COPY_AND_ASSIGN(PrintPreviewDialogControllerBrowserTest); DISALLOW_COPY_AND_ASSIGN(PrintPreviewDialogControllerBrowserTest);
}; };
// Flaky on Linux: crbug.com/1021545
#if defined(OS_LINUX)
#define MAYBE_NavigateFromInitiatorTab DISABLED_NavigateFromInitiatorTab
#else
#define MAYBE_NavigateFromInitiatorTab NavigateFromInitiatorTab
#endif
// Test to verify that when a initiator navigates, we can create a new preview // Test to verify that when a initiator navigates, we can create a new preview
// dialog for the new tab contents. // dialog for the new tab contents.
IN_PROC_BROWSER_TEST_F(PrintPreviewDialogControllerBrowserTest, IN_PROC_BROWSER_TEST_F(PrintPreviewDialogControllerBrowserTest,
NavigateFromInitiatorTab) { MAYBE_NavigateFromInitiatorTab) {
// Print for the first time. // Print for the first time.
PrintPreview(); PrintPreview();
...@@ -251,10 +257,16 @@ IN_PROC_BROWSER_TEST_F(PrintPreviewDialogControllerBrowserTest, ...@@ -251,10 +257,16 @@ IN_PROC_BROWSER_TEST_F(PrintPreviewDialogControllerBrowserTest,
EXPECT_TRUE(new_preview_dialog); EXPECT_TRUE(new_preview_dialog);
} }
// Flaky on Linux: crbug.com/1021545
#if defined(OS_LINUX)
#define MAYBE_ReloadInitiatorTab DISABLED_ReloadInitiatorTab
#else
#define MAYBE_ReloadInitiatorTab ReloadInitiatorTab
#endif
// Test to verify that after reloading the initiator, it creates a new print // Test to verify that after reloading the initiator, it creates a new print
// preview dialog. // preview dialog.
IN_PROC_BROWSER_TEST_F(PrintPreviewDialogControllerBrowserTest, IN_PROC_BROWSER_TEST_F(PrintPreviewDialogControllerBrowserTest,
ReloadInitiatorTab) { MAYBE_ReloadInitiatorTab) {
// Print for the first time. // Print for the first time.
PrintPreview(); PrintPreview();
...@@ -285,10 +297,16 @@ IN_PROC_BROWSER_TEST_F(PrintPreviewDialogControllerBrowserTest, ...@@ -285,10 +297,16 @@ IN_PROC_BROWSER_TEST_F(PrintPreviewDialogControllerBrowserTest,
EXPECT_TRUE(new_preview_dialog); EXPECT_TRUE(new_preview_dialog);
} }
// Flaky on Linux: crbug.com/1021545
#if defined(OS_LINUX)
#define MAYBE_PdfPluginDisabled DISABLED_PdfPluginDisabled
#else
#define MAYBE_PdfPluginDisabled PdfPluginDisabled
#endif
// Test to verify that after print preview works even when the PDF plugin is // Test to verify that after print preview works even when the PDF plugin is
// disabled for webpages. // disabled for webpages.
IN_PROC_BROWSER_TEST_F(PrintPreviewDialogControllerBrowserTest, IN_PROC_BROWSER_TEST_F(PrintPreviewDialogControllerBrowserTest,
PdfPluginDisabled) { MAYBE_PdfPluginDisabled) {
// Make sure plugins are loaded. // Make sure plugins are loaded.
{ {
base::RunLoop run_loop; base::RunLoop run_loop;
...@@ -352,8 +370,14 @@ const std::vector<task_manager::WebContentsTag*>& GetTrackedTags() { ...@@ -352,8 +370,14 @@ const std::vector<task_manager::WebContentsTag*>& GetTrackedTags() {
} // namespace } // namespace
// Flaky on Linux: crbug.com/1021545
#if defined(OS_LINUX)
#define MAYBE_TaskManagementTest DISABLED_TaskManagementTest
#else
#define MAYBE_TaskManagementTest TaskManagementTest
#endif
IN_PROC_BROWSER_TEST_F(PrintPreviewDialogControllerBrowserTest, IN_PROC_BROWSER_TEST_F(PrintPreviewDialogControllerBrowserTest,
TaskManagementTest) { MAYBE_TaskManagementTest) {
// This test starts with two tabs open. // This test starts with two tabs open.
EXPECT_EQ(2U, GetTrackedTags().size()); EXPECT_EQ(2U, GetTrackedTags().size());
...@@ -394,8 +418,14 @@ IN_PROC_BROWSER_TEST_F(PrintPreviewDialogControllerBrowserTest, ...@@ -394,8 +418,14 @@ IN_PROC_BROWSER_TEST_F(PrintPreviewDialogControllerBrowserTest,
base::CompareCase::INSENSITIVE_ASCII)); base::CompareCase::INSENSITIVE_ASCII));
} }
// Flaky on Linux: crbug.com/1021545
#if defined(OS_LINUX)
#define MAYBE_PrintPreviewPdfAccessibility DISABLED_PrintPreviewPdfAccessibility
#else
#define MAYBE_PrintPreviewPdfAccessibility PrintPreviewPdfAccessibility
#endif
IN_PROC_BROWSER_TEST_F(PrintPreviewDialogControllerBrowserTest, IN_PROC_BROWSER_TEST_F(PrintPreviewDialogControllerBrowserTest,
PrintPreviewPdfAccessibility) { MAYBE_PrintPreviewPdfAccessibility) {
content::BrowserAccessibilityState::GetInstance()->EnableAccessibility(); content::BrowserAccessibilityState::GetInstance()->EnableAccessibility();
ui_test_utils::NavigateToURL(browser(), GURL("data:text/html,HelloWorld")); ui_test_utils::NavigateToURL(browser(), GURL("data:text/html,HelloWorld"));
PrintPreview(); PrintPreview();
......
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