diff options
| author | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-20 14:16:17 +0000 |
|---|---|---|
| committer | thomasvl@chromium.org <thomasvl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-20 14:16:17 +0000 |
| commit | b699a178d982f7de0025e492e965c64b28c78026 (patch) | |
| tree | 632cc90210cff10b1d3f9c896334bb9093bb17c9 | |
| parent | 301c2edc6810fd21354fc2bc5ef9bf770a60b697 (diff) | |
| download | chromium_src-b699a178d982f7de0025e492e965c64b28c78026.zip chromium_src-b699a178d982f7de0025e492e965c64b28c78026.tar.gz chromium_src-b699a178d982f7de0025e492e965c64b28c78026.tar.bz2 | |
[Mac] Mark a test flaky since it fails most of the time on 10.6
TBR=stuartmorgan
BUG=42086
TEST=none
Review URL: http://codereview.chromium.org/1527039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45033 0039d316-1c4b-4281-b951-d872f2087c98
| -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 c6f4a71..2d8fe1a 100644 --- a/chrome/test/ui/npapi_uitest.cc +++ b/chrome/test/ui/npapi_uitest.cc @@ -93,7 +93,13 @@ TEST_F(NPAPITester, FLAKY_GetJavaScriptURL2) { // Tests that if an NPObject is proxies back to its original process, the // original pointer is returned and not a proxy. If this fails the plugin // will crash. -TEST_F(NPAPITester, NPObjectProxy) { +#if defined(OS_MACOSX) +// http://crbug.com/42086 - fails on 10.6 most of the time +#define MAYBE_NPObjectProxy FLAKY_NPObjectProxy +#else +#define MAYBE_NPObjectProxy NPObjectProxy +#endif +TEST_F(NPAPITester, MAYBE_NPObjectProxy) { const FilePath test_case(FILE_PATH_LITERAL("npobject_proxy.html")); GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case); ASSERT_NO_FATAL_FAILURE(NavigateToURL(url)); |