summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authorpolina@google.com <polina@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-12 03:08:53 +0000
committerpolina@google.com <polina@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-12 03:08:53 +0000
commit61d2eeaa086f14eefbaea1d029686192a3fadfb4 (patch)
treeb5040c89d8595dd865e3f46289a2eabd5934e328 /chrome/test
parent9d7104d3c6bb7238dbde877e19f26d48bee93be4 (diff)
downloadchromium_src-61d2eeaa086f14eefbaea1d029686192a3fadfb4.zip
chromium_src-61d2eeaa086f14eefbaea1d029686192a3fadfb4.tar.gz
chromium_src-61d2eeaa086f14eefbaea1d029686192a3fadfb4.tar.bz2
ppapi_tests: FlashFullscreen does not flake in-process. Fix the disabling,
provide correct bug references. BUG=108471 Review URL: http://codereview.chromium.org/9166032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117377 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/ui/ppapi_uitest.cc17
1 files changed, 11 insertions, 6 deletions
diff --git a/chrome/test/ui/ppapi_uitest.cc b/chrome/test/ui/ppapi_uitest.cc
index 7680278..f051b14 100644
--- a/chrome/test/ui/ppapi_uitest.cc
+++ b/chrome/test/ui/ppapi_uitest.cc
@@ -575,19 +575,24 @@ TEST_PPAPI_IN_PROCESS_VIA_HTTP(FileSystem)
TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(FileSystem)
TEST_PPAPI_NACL_VIA_HTTP(FileSystem)
-// http://crbug.com/96767 and 104384 for aura and 108180 for linux
-// reaches NOTIMPLEMENTED checks in some cases.
-#if defined(OS_MACOSX) || defined(USE_AURA) || defined(OS_LINUX)
+// Mac/Aura reach NOTIMPLEMENTED/time out.
+// Other systems work in-process, but flake out-of-process because of the
+// asyncronous nature of the proxy.
+// mac: http://crbug.com/96767
+// aura: http://crbug.com/104384
+// async flakiness: http://crbug.com/108471
+#if defined(OS_MACOSX) || defined(USE_AURA)
#define MAYBE_FlashFullscreen DISABLED_FlashFullscreen
+#define MAYBE_OutOfProcessFlashFullscreen DISABLED_FlashFullscreen
#else
-// http://crbug.com/108471.
-#define MAYBE_FlashFullscreen FLAKY_FlashFullscreen
+#define MAYBE_FlashFullscreen FlashFullscreen
+#define MAYBE_OutOfProcessFlashFullscreen FLAKY_FlashFullscreen
#endif
TEST_F(PPAPITest, MAYBE_FlashFullscreen) {
RunTestViaHTTP("FlashFullscreen");
}
-TEST_F(OutOfProcessPPAPITest, MAYBE_FlashFullscreen) {
+TEST_F(OutOfProcessPPAPITest, MAYBE_OutOfProcessFlashFullscreen) {
RunTestViaHTTP("FlashFullscreen");
}