diff options
author | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-24 23:48:38 +0000 |
---|---|---|
committer | enne@chromium.org <enne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-24 23:48:38 +0000 |
commit | 35abc3355d9fac5b8b85cd974cc77797034cb54c (patch) | |
tree | b5a768de2253125dc51b248f7199731d7141bd88 | |
parent | 3c8c4e3db0e4725d03775bde19052c467c57feaf (diff) | |
download | chromium_src-35abc3355d9fac5b8b85cd974cc77797034cb54c.zip chromium_src-35abc3355d9fac5b8b85cd974cc77797034cb54c.tar.gz chromium_src-35abc3355d9fac5b8b85cd974cc77797034cb54c.tar.bz2 |
Disable browser tests that WebKit r108729 breaks
Once this lands, then WebKit can roll past this revision, and the tests can be fixed and re-enabled.
TEST=none
BUG=none
Review URL: https://chromiumcodereview.appspot.com/9460024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123590 0039d316-1c4b-4281-b951-d872f2087c98
5 files changed, 11 insertions, 11 deletions
diff --git a/chrome/browser/extensions/extension_get_views_apitest.cc b/chrome/browser/extensions/extension_get_views_apitest.cc index 2b031b5..2ce3e7a 100644 --- a/chrome/browser/extensions/extension_get_views_apitest.cc +++ b/chrome/browser/extensions/extension_get_views_apitest.cc @@ -6,7 +6,7 @@ #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/common/chrome_switches.h" -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, GetViews) { +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_GetViews) { // TODO(finnur): Remove once infobars are no longer experimental (bug 39511). CommandLine::ForCurrentProcess()->AppendSwitch( switches::kEnableExperimentalExtensionApis); diff --git a/chrome/browser/extensions/extension_tabs_apitest.cc b/chrome/browser/extensions/extension_tabs_apitest.cc index 41da815..2c98bb0 100644 --- a/chrome/browser/extensions/extension_tabs_apitest.cc +++ b/chrome/browser/extensions/extension_tabs_apitest.cc @@ -72,7 +72,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabEvents) { ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "events.html")) << message_; } -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabRelativeURLs) { +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_TabRelativeURLs) { ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "relative_urls.html")) << message_; } @@ -97,7 +97,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabCurrentWindow) { ASSERT_TRUE(RunExtensionTest("tabs/current_window")) << message_; } -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabGetCurrent) { +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_TabGetCurrent) { ASSERT_TRUE(RunExtensionTest("tabs/get_current")) << message_; } @@ -111,7 +111,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_TabOnRemoved) { ASSERT_TRUE(RunExtensionTest("tabs/on_removed")) << message_; } -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabReload) { +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_TabReload) { ASSERT_TRUE(RunExtensionTest("tabs/reload")) << message_; } @@ -200,11 +200,11 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, IncognitoDisabledByPref) { ASSERT_TRUE(RunExtensionTest("tabs/incognito_disabled")) << message_; } -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, GetViewsOfCreatedPopup) { +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_GetViewsOfCreatedPopup) { ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_popup.html")) << message_; } -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, GetViewsOfCreatedWindow) { +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_GetViewsOfCreatedWindow) { ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_window.html")) << message_; } diff --git a/chrome/browser/extensions/extension_websocket_apitest.cc b/chrome/browser/extensions/extension_websocket_apitest.cc index 54f0936..9157117 100644 --- a/chrome/browser/extensions/extension_websocket_apitest.cc +++ b/chrome/browser/extensions/extension_websocket_apitest.cc @@ -8,7 +8,7 @@ #include "chrome/test/base/ui_test_utils.h" #include "net/base/mock_host_resolver.h" -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebSocket) { +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_WebSocket) { FilePath websocket_root_dir; ASSERT_TRUE(PathService::Get(chrome::DIR_LAYOUT_TESTS, &websocket_root_dir)); diff --git a/chrome/browser/extensions/window_open_apitest.cc b/chrome/browser/extensions/window_open_apitest.cc index ef4e9f9..2becb95 100644 --- a/chrome/browser/extensions/window_open_apitest.cc +++ b/chrome/browser/extensions/window_open_apitest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -245,6 +245,6 @@ IN_PROC_BROWSER_TEST_F(WindowOpenPanelTest, WaitForTabsAndPopups(browser(), 1, 1, 0); } -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WindowOpener) { +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_WindowOpener) { ASSERT_TRUE(RunExtensionTest("window_open/opener")) << message_; } diff --git a/chrome/browser/infobars/infobar_extension_apitest.cc b/chrome/browser/infobars/infobar_extension_apitest.cc index 0d7ce74..1c7eb48 100644 --- a/chrome/browser/infobars/infobar_extension_apitest.cc +++ b/chrome/browser/infobars/infobar_extension_apitest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -14,7 +14,7 @@ #define MAYBE_Infobars DISABLED_Infobars #endif -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_Infobars) { +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_Infobars) { // TODO(finnur): Remove once infobars are no longer experimental (bug 39511). CommandLine::ForCurrentProcess()->AppendSwitch( switches::kEnableExperimentalExtensionApis); |