summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_toolbar_model_browsertest.cc
diff options
context:
space:
mode:
authordewittj@chromium.org <dewittj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-01 19:40:03 +0000
committerdewittj@chromium.org <dewittj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-01 19:40:03 +0000
commite8b2e42a4e384395c0a0f792cf43a5dc093edc2f (patch)
tree0f319d12b26f6bfcb607b44796a17faa751da468 /chrome/browser/extensions/extension_toolbar_model_browsertest.cc
parent0eea1cf7b09138e30f1781750c515aee2c285d69 (diff)
downloadchromium_src-e8b2e42a4e384395c0a0f792cf43a5dc093edc2f.zip
chromium_src-e8b2e42a4e384395c0a0f792cf43a5dc093edc2f.tar.gz
chromium_src-e8b2e42a4e384395c0a0f792cf43a5dc093edc2f.tar.bz2
Disable the ExtensionToolbarModelTest.HighlightModeRemove test on mac.
From the logs: Retrying 1 test (retry #1) [0401/112720:ERROR:kill_posix.cc(191)] Unable to terminate process group 7136: No such process [ RUN ] ExtensionToolbarModelTest.HighlightModeRemove [852/852] ExtensionToolbarModelTest.HighlightModeRemove (2093 ms) Retrying 1 test (retry #2) [0401/112723:ERROR:kill_posix.cc(191)] Unable to terminate process group 7140: No such process [ RUN ] ExtensionToolbarModelTest.HighlightModeRemove [853/853] ExtensionToolbarModelTest.HighlightModeRemove (2356 ms) Retrying 1 test (retry #3) [0401/112725:ERROR:kill_posix.cc(191)] Unable to terminate process group 7146: No such process [ RUN ] ExtensionToolbarModelTest.HighlightModeRemove [854/854] ExtensionToolbarModelTest.HighlightModeRemove (2094 ms) 1 test failed: ExtensionToolbarModelTest.HighlightModeRemove NOTRY=true R=rlarocque@chromium.org TBR=kalman@chromium.org BUG=358752 Review URL: https://codereview.chromium.org/221193003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260930 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_toolbar_model_browsertest.cc')
-rw-r--r--chrome/browser/extensions/extension_toolbar_model_browsertest.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_toolbar_model_browsertest.cc b/chrome/browser/extensions/extension_toolbar_model_browsertest.cc
index a3759f4..e9d5a98 100644
--- a/chrome/browser/extensions/extension_toolbar_model_browsertest.cc
+++ b/chrome/browser/extensions/extension_toolbar_model_browsertest.cc
@@ -468,7 +468,14 @@ IN_PROC_BROWSER_TEST_F(ExtensionToolbarModelTest, HighlightMode) {
EXPECT_EQ(id_c, ExtensionAt(2)->id());
}
-IN_PROC_BROWSER_TEST_F(ExtensionToolbarModelTest, HighlightModeRemove) {
+#if defined(OS_MACOSX)
+// Flaky on Mac bots: http://crbug.com/358752
+#define MAYBE_HighlightModeRemove DISABLED_HighlightModeRemove
+#else
+#define MAYBE_HighlightModeRemove HighlightModeRemove
+#endif
+
+IN_PROC_BROWSER_TEST_F(ExtensionToolbarModelTest, MAYBE_HighlightModeRemove) {
// Load three extensions with browser action.
base::FilePath extension_a_path(test_data_dir_.AppendASCII("api_test")
.AppendASCII("browser_action")