diff options
| author | rkc@chromium.org <rkc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-19 20:05:03 +0000 |
|---|---|---|
| committer | rkc@chromium.org <rkc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-19 20:05:03 +0000 |
| commit | 875f3d04e9f8d802d269745b8abf77043b2c6fcf (patch) | |
| tree | 53ab4c0e50113f04954f28a6f0dad5162d7c4ca8 /chrome | |
| parent | fece3a7e17e0cd75ff3fa5a3ab88c41e94f7a923 (diff) | |
| download | chromium_src-875f3d04e9f8d802d269745b8abf77043b2c6fcf.zip chromium_src-875f3d04e9f8d802d269745b8abf77043b2c6fcf.tar.gz chromium_src-875f3d04e9f8d802d269745b8abf77043b2c6fcf.tar.bz2 | |
Disable PDF tests and SizeWindow on Chrome OS
PDF tests have been disabled due to a crash they have on Chrome OS; see attached bug.
The SizeWindow test doesn't apply to ChromeOS since Chrome OS doesn't allow resizing windows anyway.
R=zelidrag@chromium.org
BUG=chromium:79837
TEST=Built and ran the tests I can for a Chromium build, PDF browertests won't run unless I have an official build; also ran the trybots.
Review URL: http://codereview.chromium.org/6879029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82144 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/ui/views/html_dialog_view_browsertest.cc | 5 | ||||
| -rw-r--r-- | chrome/test/plugin/pdf_browsertest.cc | 24 |
2 files changed, 24 insertions, 5 deletions
diff --git a/chrome/browser/ui/views/html_dialog_view_browsertest.cc b/chrome/browser/ui/views/html_dialog_view_browsertest.cc index 49e64fd..5915883 100644 --- a/chrome/browser/ui/views/html_dialog_view_browsertest.cc +++ b/chrome/browser/ui/views/html_dialog_view_browsertest.cc @@ -113,13 +113,14 @@ class HtmlDialogBrowserTest : public InProcessBrowserTest { #endif }; -#if defined(OS_LINUX) +#if defined(OS_LINUX) && !defined(OS_CHROMEOS) #define MAYBE_SizeWindow SizeWindow #else // http://code.google.com/p/chromium/issues/detail?id=52602 // Windows has some issues resizing windows- an off by one problem, // and a minimum size that seems too big. This file isn't included in -// Mac builds yet. +// Mac builds yet. On Chrome OS, this test doesn't apply since ChromeOS +// doesn't allow resizing of windows. #define MAYBE_SizeWindow DISABLED_SizeWindow #endif diff --git a/chrome/test/plugin/pdf_browsertest.cc b/chrome/test/plugin/pdf_browsertest.cc index 750fed4..d96ec87 100644 --- a/chrome/test/plugin/pdf_browsertest.cc +++ b/chrome/test/plugin/pdf_browsertest.cc @@ -192,16 +192,28 @@ class PDFBrowserTest : public InProcessBrowserTest, scoped_ptr<net::TestServer> pdf_test_server_; }; +#if defined(OS_CHROMEOS) +// TODO(sanjeevr): http://crbug.com/79837 +#define MAYBE_Basic DISABLED_Basic +#else +#define MAYBE_Basic Basic +#endif // Tests basic PDF rendering. This can be broken depending on bad merges with // the vendor, so it's important that we have basic sanity checking. -IN_PROC_BROWSER_TEST_F(PDFBrowserTest, Basic) { +IN_PROC_BROWSER_TEST_F(PDFBrowserTest, MAYBE_Basic) { ASSERT_NO_FATAL_FAILURE(Load()); ASSERT_NO_FATAL_FAILURE(WaitForResponse()); ASSERT_NO_FATAL_FAILURE(VerifySnapshot("pdf_browsertest.png")); } +#if defined(OS_CHROMEOS) +// TODO(sanjeevr): http://crbug.com/79837 +#define MAYBE_Scroll DISABLED_Scroll +#else +#define MAYBE_Scroll Scroll +#endif // Tests that scrolling works. -IN_PROC_BROWSER_TEST_F(PDFBrowserTest, Scroll) { +IN_PROC_BROWSER_TEST_F(PDFBrowserTest, MAYBE_Scroll) { ASSERT_NO_FATAL_FAILURE(Load()); // We use wheel mouse event since that's the only one we can easily push to @@ -224,7 +236,13 @@ IN_PROC_BROWSER_TEST_F(PDFBrowserTest, Scroll) { ASSERT_GT(y_offset, 0); } -IN_PROC_BROWSER_TEST_F(PDFBrowserTest, FindAndCopy) { +#if defined(OS_CHROMEOS) +// TODO(sanjeevr): http://crbug.com/79837 +#define MAYBE_FindAndCopy DISABLED_FindAndCopy +#else +#define MAYBE_FindAndCopy FindAndCopy +#endif +IN_PROC_BROWSER_TEST_F(PDFBrowserTest, MAYBE_FindAndCopy) { ASSERT_NO_FATAL_FAILURE(Load()); // Verifies that find in page works. ASSERT_EQ(3, ui_test_utils::FindInPage( |