Commit badbd8aa authored by tzik@chromium.org's avatar tzik@chromium.org

[Test] Disable WebGLInfoBarTest.

Disabling following flaky tests on Mac:
WebGLInfoBarTest.ContextLossRaisesInfoBar
WebGLInfoBarTest.ContextLossInfoBarReload

TBR=zmo@chromium.org, danakj@chromium.org
BUG=324555
NOTRY=true

Review URL: https://codereview.chromium.org/100603004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238313 0039d316-1c4b-4281-b951-d872f2087c98
parent bf0acf0b
...@@ -60,7 +60,14 @@ class WebGLInfoBarTest : public InProcessBrowserTest { ...@@ -60,7 +60,14 @@ class WebGLInfoBarTest : public InProcessBrowserTest {
base::FilePath gpu_test_dir_; base::FilePath gpu_test_dir_;
}; };
IN_PROC_BROWSER_TEST_F(WebGLInfoBarTest, ContextLossRaisesInfoBar) { // This test is flaky on Mac. http://crbug.com/324555
#if defined(OS_MACOSX)
#define MAYBE_ContextLossRaisesInfoBar DISABLED_ContextLossRaisesInfoBar
#else
#define MAYBE_ContextLossRaisesInfoBar ContextLossRaisesInfoBar
#endif
IN_PROC_BROWSER_TEST_F(WebGLInfoBarTest, MAYBE_ContextLossRaisesInfoBar) {
#undef MAYBE_ContextLossRaisesInfoBard
#if defined(OS_WIN) && defined(USE_ASH) #if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796). // Disable this test in Metro+Ash for now (http://crbug.com/262796).
if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
...@@ -93,7 +100,7 @@ IN_PROC_BROWSER_TEST_F(WebGLInfoBarTest, ContextLossRaisesInfoBar) { ...@@ -93,7 +100,7 @@ IN_PROC_BROWSER_TEST_F(WebGLInfoBarTest, ContextLossRaisesInfoBar) {
// This test is flaky on Mac. http://crbug.com/324555 // This test is flaky on Mac. http://crbug.com/324555
#if defined(OS_MACOSX) #if defined(OS_MACOSX)
#define MAYBE_ContextLossInfoBarReload FLAKY_ContextLossInfoBarReload #define MAYBE_ContextLossInfoBarReload DISABLED_ContextLossInfoBarReload
#else #else
#define MAYBE_ContextLossInfoBarReload ContextLossInfoBarReload #define MAYBE_ContextLossInfoBarReload ContextLossInfoBarReload
#endif #endif
......
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