summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-17 17:46:11 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-17 17:46:11 +0000
commit3363fbf473fd164aeffeb9805ec2c4984b50b93c (patch)
tree093c4635e07b8333a7572b6f0409f8812325cc93
parenta83fd1495e739957ee68dd429aeab202d627d199 (diff)
downloadchromium_src-3363fbf473fd164aeffeb9805ec2c4984b50b93c.zip
chromium_src-3363fbf473fd164aeffeb9805ec2c4984b50b93c.tar.gz
chromium_src-3363fbf473fd164aeffeb9805ec2c4984b50b93c.tar.bz2
Disable spree. Disable lots of apps tests on 472 because apps are
permanently disabled there. Review URL: http://codereview.chromium.org/3175018 git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56382 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/browser_browsertest.cc16
-rw-r--r--chrome/browser/extensions/app_background_page_apitest.cc4
-rw-r--r--chrome/browser/extensions/extensions_service_unittest.cc2
3 files changed, 11 insertions, 11 deletions
diff --git a/chrome/browser/browser_browsertest.cc b/chrome/browser/browser_browsertest.cc
index 0525058..7e6d450 100644
--- a/chrome/browser/browser_browsertest.cc
+++ b/chrome/browser/browser_browsertest.cc
@@ -451,7 +451,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, RevivePhantomTab) {
// Makes sure TabClosing is sent when uninstalling an extension that is an app
// tab.
-IN_PROC_BROWSER_TEST_F(BrowserTest, TabClosingWhenRemovingExtension) {
+IN_PROC_BROWSER_TEST_F(BrowserTest, DISABLED_TabClosingWhenRemovingExtension) {
HTTPTestServer* server = StartHTTPServer();
ASSERT_TRUE(server);
host_resolver()->AddRule("www.example.com", "127.0.0.1");
@@ -552,7 +552,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_PageLanguageDetection) {
#define RestorePinnedTabs DISABLED_RestorePinnedTabs
#endif
// Makes sure pinned tabs are restored correctly on start.
-IN_PROC_BROWSER_TEST_F(BrowserTest, RestorePinnedTabs) {
+IN_PROC_BROWSER_TEST_F(BrowserTest, DISABLED_RestorePinnedTabs) {
HTTPTestServer* server = StartHTTPServer();
ASSERT_TRUE(server);
@@ -699,7 +699,7 @@ class BrowserAppRefocusTest : public ExtensionBrowserTest {
#endif
// Test that launching an app refocuses a tab already hosting the app.
-IN_PROC_BROWSER_TEST_F(BrowserAppRefocusTest, MAYBE_OpenTab) {
+IN_PROC_BROWSER_TEST_F(BrowserAppRefocusTest, DISABLED_OpenTab) {
SetUpExtensionApp();
ASSERT_EQ(1, browser()->tab_count());
@@ -755,7 +755,7 @@ IN_PROC_BROWSER_TEST_F(BrowserAppRefocusTest, MAYBE_OpenTab) {
}
// Test that launching an app refocuses a panel running the app.
-IN_PROC_BROWSER_TEST_F(BrowserAppRefocusTest, MAYBE_OpenPanel) {
+IN_PROC_BROWSER_TEST_F(BrowserAppRefocusTest, DISABLED_OpenPanel) {
SetUpExtensionApp();
ASSERT_EQ(1, browser()->tab_count());
@@ -788,7 +788,7 @@ IN_PROC_BROWSER_TEST_F(BrowserAppRefocusTest, MAYBE_OpenPanel) {
}
// Test that launching an app refocuses a window running the app.
-IN_PROC_BROWSER_TEST_F(BrowserAppRefocusTest, MAYBE_OpenWindow) {
+IN_PROC_BROWSER_TEST_F(BrowserAppRefocusTest, DISABLED_OpenWindow) {
SetUpExtensionApp();
ASSERT_EQ(1, browser()->tab_count());
@@ -818,7 +818,7 @@ IN_PROC_BROWSER_TEST_F(BrowserAppRefocusTest, MAYBE_OpenWindow) {
// Test that if an app is opened while running in a window and a tab,
// the window is focused.
-IN_PROC_BROWSER_TEST_F(BrowserAppRefocusTest, MAYBE_WindowBeforeTab) {
+IN_PROC_BROWSER_TEST_F(BrowserAppRefocusTest, DISABLED_WindowBeforeTab) {
SetUpExtensionApp();
ASSERT_EQ(1, browser()->tab_count());
@@ -847,7 +847,7 @@ IN_PROC_BROWSER_TEST_F(BrowserAppRefocusTest, MAYBE_WindowBeforeTab) {
// Test that if an app is opened while running in a panel and a tab,
// the panel is focused.
-IN_PROC_BROWSER_TEST_F(BrowserAppRefocusTest, MAYBE_PanelBeforeTab) {
+IN_PROC_BROWSER_TEST_F(BrowserAppRefocusTest, DISABLED_PanelBeforeTab) {
SetUpExtensionApp();
ASSERT_EQ(1, browser()->tab_count());
@@ -876,7 +876,7 @@ IN_PROC_BROWSER_TEST_F(BrowserAppRefocusTest, MAYBE_PanelBeforeTab) {
// Test that if multiple tabs host an app, and that app is opened,
// the tab in the current window gets focus.
-IN_PROC_BROWSER_TEST_F(BrowserAppRefocusTest, MAYBE_TabInFocusedWindow) {
+IN_PROC_BROWSER_TEST_F(BrowserAppRefocusTest, DISABLED_TabInFocusedWindow) {
SetUpExtensionApp();
ASSERT_EQ(1, browser()->tab_count());
diff --git a/chrome/browser/extensions/app_background_page_apitest.cc b/chrome/browser/extensions/app_background_page_apitest.cc
index f16dad3..68a121b 100644
--- a/chrome/browser/extensions/app_background_page_apitest.cc
+++ b/chrome/browser/extensions/app_background_page_apitest.cc
@@ -17,7 +17,7 @@ class AppBackgroundPageApiTest : public ExtensionApiTest {
}
};
-IN_PROC_BROWSER_TEST_F(AppBackgroundPageApiTest, Basic) {
+IN_PROC_BROWSER_TEST_F(AppBackgroundPageApiTest, DISABLED_Basic) {
host_resolver()->AddRule("a.com", "127.0.0.1");
ASSERT_TRUE(StartHTTPServer());
@@ -26,7 +26,7 @@ IN_PROC_BROWSER_TEST_F(AppBackgroundPageApiTest, Basic) {
ASSERT_TRUE(RunExtensionTest("app_background_page/basic")) << message_;
}
-IN_PROC_BROWSER_TEST_F(AppBackgroundPageApiTest, LacksPermission) {
+IN_PROC_BROWSER_TEST_F(AppBackgroundPageApiTest, DISABLED_LacksPermission) {
host_resolver()->AddRule("a.com", "127.0.0.1");
ASSERT_TRUE(StartHTTPServer());
diff --git a/chrome/browser/extensions/extensions_service_unittest.cc b/chrome/browser/extensions/extensions_service_unittest.cc
index 972bd92..d4d48bc 100644
--- a/chrome/browser/extensions/extensions_service_unittest.cc
+++ b/chrome/browser/extensions/extensions_service_unittest.cc
@@ -1038,7 +1038,7 @@ TEST_F(ExtensionsServiceTest, InstallLocalizedTheme) {
EXPECT_EQ("description", service_->extensions()->at(0)->description());
}
-TEST_F(ExtensionsServiceTest, InstallApps) {
+TEST_F(ExtensionsServiceTest, DISABLED_InstallApps) {
InitializeEmptyExtensionsService();
FilePath extensions_path;
ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &extensions_path));