diff options
| author | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-22 19:30:56 +0000 |
|---|---|---|
| committer | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-22 19:30:56 +0000 |
| commit | 776bddff599c102c487e81de15c74e9c6d2f6917 (patch) | |
| tree | e2362e8c78a6ec96d4ed60448e44b802b960c26b /chrome | |
| parent | 82da7ce7684b509ab4d7054979a37d14a1411e65 (diff) | |
| download | chromium_src-776bddff599c102c487e81de15c74e9c6d2f6917.zip chromium_src-776bddff599c102c487e81de15c74e9c6d2f6917.tar.gz chromium_src-776bddff599c102c487e81de15c74e9c6d2f6917.tar.bz2 | |
Marks NPAPITester.Arguments as flaky on Mac.
TBR=stuartmorgan@chromium.org
Review URL: http://codereview.chromium.org/1763005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45340 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/test/ui/npapi_uitest.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/test/ui/npapi_uitest.cc b/chrome/test/ui/npapi_uitest.cc index 2d8fe1a..27d8978 100644 --- a/chrome/test/ui/npapi_uitest.cc +++ b/chrome/test/ui/npapi_uitest.cc @@ -36,7 +36,13 @@ using npapi_test::kTestCompleteSuccess; static const FilePath::CharType* kTestDir = FILE_PATH_LITERAL("npapi"); // Test passing arguments to a plugin. -TEST_F(NPAPITester, Arguments) { +#if defined(OS_MACOSX) +// http://crbug.com/42340 - fails on 10.6 most of the time +#define MAYBE_Arguments FLAKY_Arguments +#else +#define MAYBE_Arguments Arguments +#endif +TEST_F(NPAPITester, MAYBE_Arguments) { const FilePath test_case(FILE_PATH_LITERAL("arguments.html")); GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case); ASSERT_NO_FATAL_FAILURE(NavigateToURL(url)); |