summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_tabs_apitest.cc
diff options
context:
space:
mode:
authorrsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-14 17:29:57 +0000
committerrsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-14 17:29:57 +0000
commit3b20d019cb9526c911e6a976f5b55ed3994e3edf (patch)
tree31f5e285f8831e145edf00682e88a307170c1542 /chrome/browser/extensions/extension_tabs_apitest.cc
parent8b8c4208c14a09661e1ab4297ad837b4e547523a (diff)
downloadchromium_src-3b20d019cb9526c911e6a976f5b55ed3994e3edf.zip
chromium_src-3b20d019cb9526c911e6a976f5b55ed3994e3edf.tar.gz
chromium_src-3b20d019cb9526c911e6a976f5b55ed3994e3edf.tar.bz2
Mark ExtensionApiTest.TabOnRemoved as FLAKY on Mac and Linux.
BUG=59198 TEST=none Review URL: http://codereview.chromium.org/3815004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62572 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_tabs_apitest.cc')
-rw-r--r--chrome/browser/extensions/extension_tabs_apitest.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_tabs_apitest.cc b/chrome/browser/extensions/extension_tabs_apitest.cc
index bfa8064..886308c 100644
--- a/chrome/browser/extensions/extension_tabs_apitest.cc
+++ b/chrome/browser/extensions/extension_tabs_apitest.cc
@@ -17,6 +17,13 @@
#define MAYBE_Tabs Tabs
#endif
+// Possible race in ChromeURLDataManager. http://crbug.com/59198
+#if defined(OS_MACOSX) || defined(OS_LINUX)
+#define MAYBE_TabOnRemoved FLAKY_TabOnRemoved
+#else
+#define MAYBE_TabOnRemoved TabOnRemoved
+#endif
+
IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_Tabs) {
ASSERT_TRUE(test_server()->Start());
@@ -39,7 +46,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabConnect) {
ASSERT_TRUE(RunExtensionTest("tabs/connect")) << message_;
}
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabOnRemoved) {
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_TabOnRemoved) {
ASSERT_TRUE(test_server()->Start());
ASSERT_TRUE(RunExtensionTest("tabs/on_removed")) << message_;
}