Commit 53c9a2bd authored by thestig@chromium.org's avatar thestig@chromium.org

Disable PrintPreviewHandlerTests on CrOS. They are crashing.

BUG=104403
TEST=none
Review URL: http://codereview.chromium.org/8574028

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110220 0039d316-1c4b-4281-b951-d872f2087c98
parent 054c8016
...@@ -149,7 +149,8 @@ class PrintPreviewHandlerTest : public BrowserWithTestWindowTest { ...@@ -149,7 +149,8 @@ class PrintPreviewHandlerTest : public BrowserWithTestWindowTest {
// Test crashs on TouchUI due to initiator tab's native view having no parent. // Test crashs on TouchUI due to initiator tab's native view having no parent.
// http://crbug.com/104284 // http://crbug.com/104284
#if defined(TOUCH_UI) // Test crashes on CrOS as well. http://crbug.com/104403
#if defined(TOUCH_UI) || defined(OS_CHROMEOS)
#define MAYBE_StickyMarginsCustom DISABLED_StickyMarginsCustom #define MAYBE_StickyMarginsCustom DISABLED_StickyMarginsCustom
#else #else
#define MAYBE_StickyMarginsCustom StickyMarginsCustom #define MAYBE_StickyMarginsCustom StickyMarginsCustom
...@@ -173,8 +174,8 @@ TEST_F(PrintPreviewHandlerTest, MAYBE_StickyMarginsCustom) { ...@@ -173,8 +174,8 @@ TEST_F(PrintPreviewHandlerTest, MAYBE_StickyMarginsCustom) {
CheckCustomMargins(kMarginTop, kMarginRight, kMarginBottom, kMarginLeft); CheckCustomMargins(kMarginTop, kMarginRight, kMarginBottom, kMarginLeft);
} }
// http://crbug.com/104284 // http://crbug.com/104284, http://crbug.com/104403
#if defined(TOUCH_UI) #if defined(TOUCH_UI) || defined(OS_CHROMEOS)
#define MAYBE_StickyMarginsDefault DISABLED_StickyMarginsDefault #define MAYBE_StickyMarginsDefault DISABLED_StickyMarginsDefault
#else #else
#define MAYBE_StickyMarginsDefault StickyMarginsDefault #define MAYBE_StickyMarginsDefault StickyMarginsDefault
...@@ -192,8 +193,8 @@ TEST_F(PrintPreviewHandlerTest, MAYBE_StickyMarginsDefault) { ...@@ -192,8 +193,8 @@ TEST_F(PrintPreviewHandlerTest, MAYBE_StickyMarginsDefault) {
ASSERT_FALSE(PrintPreviewHandler::last_used_page_size_margins_); ASSERT_FALSE(PrintPreviewHandler::last_used_page_size_margins_);
} }
// http://crbug.com/104284 // http://crbug.com/104284, http://crbug.com/104403
#if defined(TOUCH_UI) #if defined(TOUCH_UI) || defined(OS_CHROMEOS)
#define MAYBE_StickyMarginsCustomThenDefault \ #define MAYBE_StickyMarginsCustomThenDefault \
DISABLED_StickyMarginsCustomThenDefault DISABLED_StickyMarginsCustomThenDefault
#else #else
...@@ -226,8 +227,8 @@ TEST_F(PrintPreviewHandlerTest, MAYBE_StickyMarginsCustomThenDefault) { ...@@ -226,8 +227,8 @@ TEST_F(PrintPreviewHandlerTest, MAYBE_StickyMarginsCustomThenDefault) {
CheckCustomMargins(kMarginTop, kMarginRight, kMarginBottom, kMarginLeft); CheckCustomMargins(kMarginTop, kMarginRight, kMarginBottom, kMarginLeft);
} }
// http://crbug.com/104284 // http://crbug.com/104284, http://crbug.com/104403
#if defined(TOUCH_UI) #if defined(TOUCH_UI) || defined(OS_CHROMEOS)
#define MAYBE_GetLastUsedMarginSettingsCustom \ #define MAYBE_GetLastUsedMarginSettingsCustom \
DISABLED_GetLastUsedMarginSettingsCustom DISABLED_GetLastUsedMarginSettingsCustom
#else #else
...@@ -263,8 +264,8 @@ TEST_F(PrintPreviewHandlerTest, MAYBE_GetLastUsedMarginSettingsCustom) { ...@@ -263,8 +264,8 @@ TEST_F(PrintPreviewHandlerTest, MAYBE_GetLastUsedMarginSettingsCustom) {
EXPECT_EQ(kMarginLeft, margin_value); EXPECT_EQ(kMarginLeft, margin_value);
} }
// http://crbug.com/104284 // http://crbug.com/104284, http://crbug.com/104403
#if defined(TOUCH_UI) #if defined(TOUCH_UI) || defined(OS_CHROMEOS)
#define MAYBE_GetLastUsedMarginSettingsDefault \ #define MAYBE_GetLastUsedMarginSettingsDefault \
DISABLED_GetLastUsedMarginSettingsDefault DISABLED_GetLastUsedMarginSettingsDefault
#else #else
......
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