diff options
| author | skerner@chromium.org <skerner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-30 18:03:42 +0000 |
|---|---|---|
| committer | skerner@chromium.org <skerner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-30 18:03:42 +0000 |
| commit | d1894cea41b1c4bff639ea125645daf8a7ce57de (patch) | |
| tree | bba063f6dfa0b471c1e876b8962e716fb20dfacd /chrome/browser | |
| parent | 6136c43ee1a776040560b1f5a82debfe6f5615c4 (diff) | |
| download | chromium_src-d1894cea41b1c4bff639ea125645daf8a7ce57de.zip chromium_src-d1894cea41b1c4bff639ea125645daf8a7ce57de.tar.gz chromium_src-d1894cea41b1c4bff639ea125645daf8a7ce57de.tar.bz2 | |
Revert 43101 - 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
Review URL: http://codereview.chromium.org/1520005
TBR=skerner@chromium.org
Review URL: http://codereview.chromium.org/1577002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43109 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/extensions/extension_tabs_apitest.cc | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/chrome/browser/extensions/extension_tabs_apitest.cc b/chrome/browser/extensions/extension_tabs_apitest.cc index 781ae74..35bbf0d 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 on chrome os: http://crbug.com/39843 -// TODO(skerner): Crash observed on linux as well: http://crbug.com/39746 -#if defined(OS_LINUX) +// 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) #define MAYBE_Tabs DISABLED_Tabs #else #define MAYBE_Tabs Tabs @@ -28,16 +28,3 @@ 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_; -} |