Commit 4639187a authored by nsylvain@chromium.org's avatar nsylvain@chromium.org

Disable many tests failing on mac 10.7

x VideoDecodeAccelerationSupportTest.Create
x ExtensionApiTest.UpdateWindowShowState
x FullscreenControllerTest.BrowserFullscreenAfterTabFSExit
x PPAPINaClGLibcTest.Fullscreen
x PPAPINaClNewlibTest.Fullscreen
x FullscreenControllerTest.BrowserFullscreenExit
x FullscreenControllerTest.TestTabExitsFullscreenOnNavigation
x FullscreenControllerTest.TestTabExitsFullscreenOnGoBack
x FullscreenControllerTest.TestFullscreenFromTabWhenAlreadyInBrowserFullscreenWorks
x KioskModeTest.EnableKioskModeTest
x FullscreenControllerInteractiveTest.EscapingMouseLockAndFullscreen
x FullscreenControllerInteractiveTest.MouseLockAndFullscreen
x FullscreenControllerInteractiveTest.ReloadExitsMouseLockAndFullscreen
x FullscreenExitBubbleControllerTest.DenyExitsFullscreen

BUG=103912
TBR=rsesek
Review URL: https://chromiumcodereview.appspot.com/10861003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152297 0039d316-1c4b-4281-b951-d872f2087c98
parent 1e43b681
...@@ -32,19 +32,21 @@ ...@@ -32,19 +32,21 @@
#define MAYBE_UpdateWindowShowState DISABLED_UpdateWindowShowState #define MAYBE_UpdateWindowShowState DISABLED_UpdateWindowShowState
#else #else
#if defined(USE_AURA) #if defined(USE_AURA) || defined(OS_MACOSX)
// Maximizing/fullscreen popup window doesn't work on aura's managed mode. // Maximizing/fullscreen popup window doesn't work on aura's managed mode.
// See bug crbug.com/116305. // See bug crbug.com/116305.
// Mac: http://crbug.com/103912
#define MAYBE_UpdateWindowShowState DISABLED_UpdateWindowShowState #define MAYBE_UpdateWindowShowState DISABLED_UpdateWindowShowState
#else #else
#define MAYBE_UpdateWindowShowState UpdateWindowShowState #define MAYBE_UpdateWindowShowState UpdateWindowShowState
#endif // defined(USE_AURA) #endif // defined(USE_AURA) || defined(OS_MACOSX)
#define MAYBE_FocusWindowDoesNotExitFullscreen FocusWindowDoesNotExitFullscreen #define MAYBE_FocusWindowDoesNotExitFullscreen FocusWindowDoesNotExitFullscreen
#define MAYBE_UpdateWindowSizeExitsFullscreen UpdateWindowSizeExitsFullscreen #define MAYBE_UpdateWindowSizeExitsFullscreen UpdateWindowSizeExitsFullscreen
#define MAYBE_UpdateWindowResize UpdateWindowResize #define MAYBE_UpdateWindowResize UpdateWindowResize
#endif // defined(OS_LINUX) && !defined(USE_AURA) #endif // defined(OS_LINUX) && !defined(USE_AURA)
class ExtensionApiNewTabTest : public ExtensionApiTest { class ExtensionApiNewTabTest : public ExtensionApiTest {
public: public:
ExtensionApiNewTabTest() {} ExtensionApiNewTabTest() {}
......
...@@ -1486,7 +1486,13 @@ class KioskModeTest : public BrowserTest { ...@@ -1486,7 +1486,13 @@ class KioskModeTest : public BrowserTest {
} }
}; };
IN_PROC_BROWSER_TEST_F(KioskModeTest, EnableKioskModeTest) { #if defined(OS_MACOSX)
// http://crbug.com/103912
#define MAYBE_EnableKioskModeTest DISABLED_EnableKioskModeTest
#else
#define MAYBE_EnableKioskModeTest EnableKioskModeTest
#endif
IN_PROC_BROWSER_TEST_F(KioskModeTest, MAYBE_EnableKioskModeTest) {
// Check if browser is in fullscreen mode. // Check if browser is in fullscreen mode.
ASSERT_TRUE(browser()->window()->IsFullscreen()); ASSERT_TRUE(browser()->window()->IsFullscreen());
ASSERT_FALSE(browser()->window()->IsFullscreenBubbleVisible()); ASSERT_FALSE(browser()->window()->IsFullscreenBubbleVisible());
......
...@@ -76,7 +76,8 @@ class FullscreenExitBubbleControllerTest : public CocoaProfileTest { ...@@ -76,7 +76,8 @@ class FullscreenExitBubbleControllerTest : public CocoaProfileTest {
scoped_nsobject<FullscreenExitBubbleController> controller_; scoped_nsobject<FullscreenExitBubbleController> controller_;
}; };
TEST_F(FullscreenExitBubbleControllerTest, DenyExitsFullscreen) { // http://crbug.com/103912
TEST_F(FullscreenExitBubbleControllerTest, DISABLED_DenyExitsFullscreen) {
NSWindow* window = browser()->window()->GetNativeWindow(); NSWindow* window = browser()->window()->GetNativeWindow();
BrowserWindowController* bwc = [BrowserWindowController BrowserWindowController* bwc = [BrowserWindowController
browserWindowControllerForWindow:window]; browserWindowControllerForWindow:window];
......
...@@ -192,7 +192,13 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerBrowserTest, ...@@ -192,7 +192,13 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerBrowserTest,
} }
// Tests Fullscreen entered in Browser, then Tab mode, then exited via Browser. // Tests Fullscreen entered in Browser, then Tab mode, then exited via Browser.
IN_PROC_BROWSER_TEST_F(FullscreenControllerTest, BrowserFullscreenExit) { #if defined(OS_MACOSX)
// http://crbug.com/103912
#define MAYBE_BrowserFullscreenExit DISABLED_BrowserFullscreenExit
#else
#define MAYBE_BrowserFullscreenExit BrowserFullscreenExit
#endif
IN_PROC_BROWSER_TEST_F(FullscreenControllerTest, MAYBE_BrowserFullscreenExit) {
// Enter browser fullscreen. // Enter browser fullscreen.
ASSERT_NO_FATAL_FAILURE(ToggleBrowserFullscreen(true)); ASSERT_NO_FATAL_FAILURE(ToggleBrowserFullscreen(true));
...@@ -207,8 +213,15 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerTest, BrowserFullscreenExit) { ...@@ -207,8 +213,15 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerTest, BrowserFullscreenExit) {
} }
// Tests Browser Fullscreen remains active after Tab mode entered and exited. // Tests Browser Fullscreen remains active after Tab mode entered and exited.
#if defined(OS_MACOSX)
// http://crbug.com/103912
#define MAYBE_BrowserFullscreenAfterTabFSExit \
DISABLED_BrowserFullscreenAfterTabFSExit
#else
#define MAYBE_BrowserFullscreenAfterTabFSExit BrowserFullscreenAfterTabFSExit
#endif
IN_PROC_BROWSER_TEST_F(FullscreenControllerTest, IN_PROC_BROWSER_TEST_F(FullscreenControllerTest,
BrowserFullscreenAfterTabFSExit) { MAYBE_BrowserFullscreenAfterTabFSExit) {
// Enter browser fullscreen. // Enter browser fullscreen.
ASSERT_NO_FATAL_FAILURE(ToggleBrowserFullscreen(true)); ASSERT_NO_FATAL_FAILURE(ToggleBrowserFullscreen(true));
...@@ -237,8 +250,16 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerTest, FullscreenFileURL) { ...@@ -237,8 +250,16 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerTest, FullscreenFileURL) {
// Tests fullscreen is exited on page navigation. // Tests fullscreen is exited on page navigation.
// (Similar to mouse lock version in FullscreenControllerInteractiveTest) // (Similar to mouse lock version in FullscreenControllerInteractiveTest)
#if defined(OS_MACOSX)
// http://crbug.com/103912
#define MAYBE_TestTabExitsFullscreenOnNavigation \
DISABLED_TestTabExitsFullscreenOnNavigation
#else
#define MAYBE_TestTabExitsFullscreenOnNavigation \
TestTabExitsFullscreenOnNavigation
#endif
IN_PROC_BROWSER_TEST_F(FullscreenControllerTest, IN_PROC_BROWSER_TEST_F(FullscreenControllerTest,
TestTabExitsFullscreenOnNavigation) { MAYBE_TestTabExitsFullscreenOnNavigation) {
ASSERT_TRUE(test_server()->Start()); ASSERT_TRUE(test_server()->Start());
ui_test_utils::NavigateToURL(browser(), GURL("about:blank")); ui_test_utils::NavigateToURL(browser(), GURL("about:blank"));
...@@ -250,8 +271,15 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerTest, ...@@ -250,8 +271,15 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerTest,
// Tests fullscreen is exited when navigating back. // Tests fullscreen is exited when navigating back.
// (Similar to mouse lock version in FullscreenControllerInteractiveTest) // (Similar to mouse lock version in FullscreenControllerInteractiveTest)
#if defined(OS_MACOSX)
// http://crbug.com/103912
#define MAYBE_TestTabExitsFullscreenOnGoBack \
DISABLED_TestTabExitsFullscreenOnGoBack
#else
#define MAYBE_TestTabExitsFullscreenOnGoBack TestTabExitsFullscreenOnGoBack
#endif
IN_PROC_BROWSER_TEST_F(FullscreenControllerTest, IN_PROC_BROWSER_TEST_F(FullscreenControllerTest,
TestTabExitsFullscreenOnGoBack) { MAYBE_TestTabExitsFullscreenOnGoBack) {
ASSERT_TRUE(test_server()->Start()); ASSERT_TRUE(test_server()->Start());
ui_test_utils::NavigateToURL(browser(), GURL("about:blank")); ui_test_utils::NavigateToURL(browser(), GURL("about:blank"));
...@@ -281,8 +309,16 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerTest, ...@@ -281,8 +309,16 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerTest,
} }
// Tests tab fullscreen exits, but browser fullscreen remains, on navigation. // Tests tab fullscreen exits, but browser fullscreen remains, on navigation.
#if defined(OS_MACOSX)
// http://crbug.com/103912
#define MAYBE_TestFullscreenFromTabWhenAlreadyInBrowserFullscreenWorks \
DISABLED_TestFullscreenFromTabWhenAlreadyInBrowserFullscreenWorks
#else
#define MAYBE_TestFullscreenFromTabWhenAlreadyInBrowserFullscreenWorks \
TestFullscreenFromTabWhenAlreadyInBrowserFullscreenWorks
#endif
IN_PROC_BROWSER_TEST_F(FullscreenControllerTest, IN_PROC_BROWSER_TEST_F(FullscreenControllerTest,
TestFullscreenFromTabWhenAlreadyInBrowserFullscreenWorks) { MAYBE_TestFullscreenFromTabWhenAlreadyInBrowserFullscreenWorks) {
ASSERT_TRUE(test_server()->Start()); ASSERT_TRUE(test_server()->Start());
ui_test_utils::NavigateToURL(browser(), GURL("about:blank")); ui_test_utils::NavigateToURL(browser(), GURL("about:blank"));
......
...@@ -80,7 +80,8 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, EscapingMouseLock) { ...@@ -80,7 +80,8 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, EscapingMouseLock) {
} }
// Times out sometimes on Linux. http://crbug.com/135115 // Times out sometimes on Linux. http://crbug.com/135115
#if defined(OS_LINUX) // Mac: http://crbug.com/103912
#if defined(OS_LINUX) || defined(OS_MACOSX)
#define MAYBE_EscapingMouseLockAndFullscreen \ #define MAYBE_EscapingMouseLockAndFullscreen \
DISABLED_EscapingMouseLockAndFullscreen DISABLED_EscapingMouseLockAndFullscreen
#else #else
...@@ -202,7 +203,8 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, ...@@ -202,7 +203,8 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
} }
// Times out sometimes on Linux. http://crbug.com/135115 // Times out sometimes on Linux. http://crbug.com/135115
#if defined(OS_LINUX) // Mac: http://crbug.com/103912
#if defined(OS_LINUX) || defined(OS_MACOSX)
#define MAYBE_MouseLockAndFullscreen DISABLED_MouseLockAndFullscreen #define MAYBE_MouseLockAndFullscreen DISABLED_MouseLockAndFullscreen
#else #else
#define MAYBE_MouseLockAndFullscreen MouseLockAndFullscreen #define MAYBE_MouseLockAndFullscreen MouseLockAndFullscreen
...@@ -420,8 +422,9 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest, ...@@ -420,8 +422,9 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerInteractiveTest,
ASSERT_TRUE(IsMouseLocked()); ASSERT_TRUE(IsMouseLocked());
} }
#if defined(OS_WIN) || defined(OS_LINUX) #if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
// http://crbug.com/137486 // http://crbug.com/137486
// mac: http://crbug.com/103912
#define ReloadExitsMouseLockAndFullscreen DISABLED_ReloadExitsMouseLockAndFullscreen #define ReloadExitsMouseLockAndFullscreen DISABLED_ReloadExitsMouseLockAndFullscreen
#endif #endif
// Tests Mouse Lock and Fullscreen are exited upon reload. // Tests Mouse Lock and Fullscreen are exited upon reload.
......
...@@ -512,9 +512,16 @@ IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_OutOfProcessFlashFullscreen) ...@@ -512,9 +512,16 @@ IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_OutOfProcessFlashFullscreen)
RunTestViaHTTP("FlashFullscreen"); RunTestViaHTTP("FlashFullscreen");
} }
TEST_PPAPI_IN_PROCESS_VIA_HTTP(Fullscreen) #if defined(OS_MACOSX)
TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(Fullscreen) // http://crbug.com/103912
TEST_PPAPI_NACL_VIA_HTTP(Fullscreen) #define MAYBE_Fullscreen DISABLED_Fullscreen
#else
#define MAYBE_Fullscreen Fullscreen
#endif
TEST_PPAPI_IN_PROCESS_VIA_HTTP(MAYBE_Fullscreen)
TEST_PPAPI_OUT_OF_PROCESS_VIA_HTTP(MAYBE_Fullscreen)
TEST_PPAPI_NACL_VIA_HTTP(MAYBE_Fullscreen)
TEST_PPAPI_IN_PROCESS(FlashClipboard) TEST_PPAPI_IN_PROCESS(FlashClipboard)
TEST_PPAPI_OUT_OF_PROCESS(FlashClipboard) TEST_PPAPI_OUT_OF_PROCESS(FlashClipboard)
......
...@@ -70,7 +70,8 @@ class VideoDecodeAccelerationSupportTest : public ui::CocoaTest { ...@@ -70,7 +70,8 @@ class VideoDecodeAccelerationSupportTest : public ui::CocoaTest {
// Test that creating VideoDecodeAccelerationSupport works on hardware that // Test that creating VideoDecodeAccelerationSupport works on hardware that
// supports it. // supports it.
TEST_F(VideoDecodeAccelerationSupportTest, Create) { // http://crbug.com/103912
TEST_F(VideoDecodeAccelerationSupportTest, DISABLED_Create) {
scoped_refptr<gfx::VideoDecodeAccelerationSupport> vda( scoped_refptr<gfx::VideoDecodeAccelerationSupport> vda(
new gfx::VideoDecodeAccelerationSupport); new gfx::VideoDecodeAccelerationSupport);
gfx::VideoDecodeAccelerationSupport::Status status = vda->Create( gfx::VideoDecodeAccelerationSupport::Status status = vda->Create(
......
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