summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_tabs_apitest.cc
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-07 16:30:21 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-07 16:30:21 +0000
commit634c59f68864a6769583f4bf81091858105c7dac (patch)
tree3c1e95c1524ad09241153c90e768ef17e95813c0 /chrome/browser/extensions/extension_tabs_apitest.cc
parent893b1aed74e92adb55587a469093c19718a07c56 (diff)
downloadchromium_src-634c59f68864a6769583f4bf81091858105c7dac.zip
chromium_src-634c59f68864a6769583f4bf81091858105c7dac.tar.gz
chromium_src-634c59f68864a6769583f4bf81091858105c7dac.tar.bz2
Disables ExtensionApiTest.Tabs2 as its very flaky on windows.
R=yoz@chromium.org TBR=yoz@chromium.org BUG=238667 Review URL: https://codereview.chromium.org/15039002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198737 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_tabs_apitest.cc')
-rw-r--r--chrome/browser/extensions/extension_tabs_apitest.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_tabs_apitest.cc b/chrome/browser/extensions/extension_tabs_apitest.cc
index 7927289..c2317be 100644
--- a/chrome/browser/extensions/extension_tabs_apitest.cc
+++ b/chrome/browser/extensions/extension_tabs_apitest.cc
@@ -83,7 +83,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiNewTabTest, Tabs) {
ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "crud.html")) << message_;
}
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Tabs2) {
+// Flaky on windows: http://crbug.com/238667
+#if defined(OS_WIN)
+#define MAYBE_Tabs2 DISABLED_Tabs2
+#else
+#define MAYBE_Tabs2 Tabs2
+#endif
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_Tabs2) {
ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "crud2.html")) << message_;
}