summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_tabs_apitest.cc
diff options
context:
space:
mode:
authorskerner@chromium.org <skerner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-01 14:56:19 +0000
committerskerner@chromium.org <skerner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-01 14:56:19 +0000
commitda9754bccd331b877a25272f2daae6d05b2f81e7 (patch)
treeeff676fc493472aba02141f6c09980ce0eea49f5 /chrome/browser/extensions/extension_tabs_apitest.cc
parent499763a4e8099df205ee393285eed7ace1d9daad (diff)
downloadchromium_src-da9754bccd331b877a25272f2daae6d05b2f81e7.zip
chromium_src-da9754bccd331b877a25272f2daae6d05b2f81e7.tar.gz
chromium_src-da9754bccd331b877a25272f2daae6d05b2f81e7.tar.bz2
Break the test of chrome.tab.captureVisibleTab() out of ExtensionApiTest.Tabs.
Tests of chrome.tab.captureVisibleTab() fail on mac 10.6, and disabling all tab tests because of this is unfortunate. Breaking the test this way makes the 10.6 failure easier to debug. BUG=37387 Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=43101 Review URL: http://codereview.chromium.org/1520005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43349 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_tabs_apitest.cc')
-rw-r--r--chrome/browser/extensions/extension_tabs_apitest.cc19
1 files changed, 16 insertions, 3 deletions
diff --git a/chrome/browser/extensions/extension_tabs_apitest.cc b/chrome/browser/extensions/extension_tabs_apitest.cc
index 35bbf0d..781ae74 100644
--- a/chrome/browser/extensions/extension_tabs_apitest.cc
+++ b/chrome/browser/extensions/extension_tabs_apitest.cc
@@ -9,9 +9,9 @@
#include "chrome/browser/profile.h"
#include "chrome/common/pref_names.h"
-// TODO(skerner): This test is flaky in linux, chromeos and on Mac OS X 10.6.
-// Figure out why and fix.
-#if defined(OS_LINUX) || defined(OS_MACOSX)
+// TODO(skerner): This test is flaky on chrome os: http://crbug.com/39843
+// TODO(skerner): Crash observed on linux as well: http://crbug.com/39746
+#if defined(OS_LINUX)
#define MAYBE_Tabs DISABLED_Tabs
#else
#define MAYBE_Tabs Tabs
@@ -28,3 +28,16 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_Tabs) {
ASSERT_TRUE(RunExtensionTest("tabs/basics")) << message_;
}
+
+// chrome.tabs.captureVisibleTab fails on the 10.6 bots.
+// http://crbug.com/37387
+#if defined(OS_MACOSX)
+#define MAYBE_CaptureVisibleTab DISABLED_CaptureVisible
+#else
+#define MAYBE_CaptureVisibleTab CaptureVisibleTab
+#endif
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_CaptureVisibleTab) {
+ StartHTTPServer();
+
+ ASSERT_TRUE(RunExtensionTest("tabs/capture_visible_tab")) << message_;
+}