diff options
author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-22 19:09:54 +0000 |
---|---|---|
committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-22 19:09:54 +0000 |
commit | a3805ce944aff2a11bc5f8b501b09322ddb1e434 (patch) | |
tree | e6f8b7c996abc925f9e524686f1235c514b1d858 | |
parent | 60a4f82da87d489d5d082d33680fa96d2c0fb493 (diff) | |
download | chromium_src-a3805ce944aff2a11bc5f8b501b09322ddb1e434.zip chromium_src-a3805ce944aff2a11bc5f8b501b09322ddb1e434.tar.gz chromium_src-a3805ce944aff2a11bc5f8b501b09322ddb1e434.tar.bz2 |
Disable a bunch of policy-related tests that started failing a while ago.
I tried reverting several changes first (see BUG), but didn't find the right
one. The consistent failures suggest that this feature is broken, so this
needs to be investigated by someone familiar with this code.
BUG=330454
TBR=skuhne@chromium.org,mnissler@chromium.org
Review URL: https://codereview.chromium.org/120563002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242326 0039d316-1c4b-4281-b951-d872f2087c98
3 files changed, 25 insertions, 12 deletions
diff --git a/chrome/browser/chromeos/login/login_screen_policy_browsertest.cc b/chrome/browser/chromeos/login/login_screen_policy_browsertest.cc index 7cd8a4f..18c2c58 100644 --- a/chrome/browser/chromeos/login/login_screen_policy_browsertest.cc +++ b/chrome/browser/chromeos/login/login_screen_policy_browsertest.cc @@ -30,7 +30,8 @@ class LoginScreenPolicyTest : public policy::DevicePolicyCrosBrowserTest { } }; -IN_PROC_BROWSER_TEST_F(LoginScreenPolicyTest, DisableSupervisedUsers) { +// http://crbug.com/330454 +IN_PROC_BROWSER_TEST_F(LoginScreenPolicyTest, DISABLED_DisableSupervisedUsers) { EXPECT_FALSE(chromeos::UserManager::Get()->AreLocallyManagedUsersAllowed()); scoped_refptr<content::MessageLoopRunner> runner( diff --git a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc index 32410d4..4619ab7 100644 --- a/chrome/browser/chromeos/policy/device_local_account_browsertest.cc +++ b/chrome/browser/chromeos/policy/device_local_account_browsertest.cc @@ -430,7 +430,8 @@ static bool IsKnownUser(const std::string& account_id) { return chromeos::UserManager::Get()->IsKnownUser(account_id); } -IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, LoginScreen) { +// http://crbug.com/330454 +IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, DISABLED_LoginScreen) { AddPublicSessionToDevicePolicy(kAccountId1); AddPublicSessionToDevicePolicy(kAccountId2); @@ -455,7 +456,8 @@ static bool DisplayNameMatches(const std::string& account_id, return true; } -IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, DisplayName) { +// http://crbug.com/330454 +IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, DISABLED_DisplayName) { UploadAndInstallDeviceLocalAccountPolicy(); AddPublicSessionToDevicePolicy(kAccountId1); @@ -464,7 +466,8 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, DisplayName) { base::Bind(&DisplayNameMatches, user_id_1_, kDisplayName)).Wait(); } -IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, PolicyDownload) { +// http://crbug.com/330454 +IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, DISABLED_PolicyDownload) { UploadDeviceLocalAccountPolicy(); AddPublicSessionToDevicePolicy(kAccountId1); @@ -523,7 +526,8 @@ static bool IsSessionStarted() { return chromeos::UserManager::Get()->IsSessionStarted(); } -IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, StartSession) { +// http://crbug.com/330454 +IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, DISABLED_StartSession) { // Specify startup pages. device_local_account_policy_.payload().mutable_restoreonstartup()->set_value( SessionStartupPref::kPrefValueURLs); @@ -581,7 +585,8 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, StartSession) { } } -IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, FullscreenDisallowed) { +// http://crbug.com/330454 +IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, DISABLED_FullscreenDisallowed) { UploadAndInstallDeviceLocalAccountPolicy(); AddPublicSessionToDevicePolicy(kAccountId1); @@ -636,7 +641,8 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, FullscreenDisallowed) { EXPECT_FALSE(browser_window->IsFullscreen()); } -IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, ExtensionsUncached) { +// http://crbug.com/330454 +IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, DISABLED_ExtensionsUncached) { // Make it possible to force-install a hosted app and an extension. ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); TestingUpdateManifestProvider testing_update_manifest_provider( @@ -734,7 +740,8 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, ExtensionsUncached) { kAccountId1, kGoodExtensionID, kGoodExtensionVersion))); } -IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, ExtensionsCached) { +// http://crbug.com/330454 +IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, DISABLED_ExtensionsCached) { ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); // Pre-populate the device local account's extension cache with a hosted app @@ -827,7 +834,8 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, ExtensionsCached) { EXPECT_FALSE(PathExists(cached_extension)); } -IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, ExternalData) { +// http://crbug.com/330454 +IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, DISABLED_ExternalData) { // chromeos::UserImageManagerImpl requests an external data fetch whenever the // key::kUserAvatarImage policy is set. Since this test wants to verify that // the underlying policy subsystem will start a fetch without this request as @@ -952,7 +960,8 @@ IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, ExternalData) { EXPECT_EQ(kExternalData, *fetched_external_data); } -IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, UserAvatarImage) { +// http://crbug.com/330454 +IN_PROC_BROWSER_TEST_F(DeviceLocalAccountTest, DISABLED_UserAvatarImage) { ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); UploadDeviceLocalAccountPolicy(); @@ -1034,7 +1043,8 @@ class TermsOfServiceTest : public DeviceLocalAccountTest, public testing::WithParamInterface<bool> { }; -IN_PROC_BROWSER_TEST_P(TermsOfServiceTest, TermsOfServiceScreen) { +// http://crbug.com/330454 +IN_PROC_BROWSER_TEST_P(TermsOfServiceTest, DISABLED_TermsOfServiceScreen) { // Specify Terms of Service URL. ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); device_local_account_policy_.payload().mutable_termsofserviceurl()->set_value( diff --git a/chrome/browser/chromeos/policy/power_policy_browsertest.cc b/chrome/browser/chromeos/policy/power_policy_browsertest.cc index 1c6775c..8f9f5b45 100644 --- a/chrome/browser/chromeos/policy/power_policy_browsertest.cc +++ b/chrome/browser/chromeos/policy/power_policy_browsertest.cc @@ -327,7 +327,9 @@ IN_PROC_BROWSER_TEST_F(PowerPolicyInSessionBrowserTest, SetDevicePolicy) { } // Verifies that user policy is applied during a session. -IN_PROC_BROWSER_TEST_F(PowerPolicyInSessionBrowserTest, SetUserPolicy) { +// http://crbug.com/330454 +IN_PROC_BROWSER_TEST_F(PowerPolicyInSessionBrowserTest, + DISABLED_SetUserPolicy) { pm::PowerManagementPolicy power_management_policy = power_manager_client_->get_policy(); power_management_policy.mutable_ac_delays()->set_screen_dim_ms(5000); |