summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordubroy@chromium.org <dubroy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-04 11:00:01 +0000
committerdubroy@chromium.org <dubroy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-04 11:00:01 +0000
commita325589c27fe04965e76bc06c63a6ee379325eee (patch)
tree20306139b8a98b05aa5ec9b10fde128394b77416
parent2836def6112df7f9b5d5978da7dac3d1dce34803 (diff)
downloadchromium_src-a325589c27fe04965e76bc06c63a6ee379325eee.zip
chromium_src-a325589c27fe04965e76bc06c63a6ee379325eee.tar.gz
chromium_src-a325589c27fe04965e76bc06c63a6ee379325eee.tar.bz2
Disable ContextLossRaisesInfoBar browser test; it's flaky on multiple platforms.
TBR=zmo@chromium.org, danakj@chromium.org BUG=324555 Review URL: https://codereview.chromium.org/103753004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238667 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/test/gpu/webgl_infobar_browsertest.cc9
1 files changed, 2 insertions, 7 deletions
diff --git a/chrome/test/gpu/webgl_infobar_browsertest.cc b/chrome/test/gpu/webgl_infobar_browsertest.cc
index ab362eb..3cd6767 100644
--- a/chrome/test/gpu/webgl_infobar_browsertest.cc
+++ b/chrome/test/gpu/webgl_infobar_browsertest.cc
@@ -59,13 +59,8 @@ class WebGLInfoBarTest : public InProcessBrowserTest {
base::FilePath gpu_test_dir_;
};
-// 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) {
+// This test is flaky. http://crbug.com/324555
+IN_PROC_BROWSER_TEST_F(WebGLInfoBarTest, DISABLED_ContextLossRaisesInfoBar) {
#undef MAYBE_ContextLossRaisesInfoBard
#if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796).