Commit 0e8d17f6 authored by antrim@chromium.org's avatar antrim@chromium.org

Temporary disable supervised user ChromeOS tests

BUG=370497
TBR=nkostylev@chromium.org
NOTRY=true

Review URL: https://codereview.chromium.org/305473004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272938 0039d316-1c4b-4281-b951-d872f2087c98
parent 8de15406
...@@ -90,12 +90,12 @@ class SupervisedUserTransactionCleanupTest2 ...@@ -90,12 +90,12 @@ class SupervisedUserTransactionCleanupTest2
}; };
IN_PROC_BROWSER_TEST_F(SupervisedUserCreationTest, IN_PROC_BROWSER_TEST_F(SupervisedUserCreationTest,
PRE_PRE_PRE_CreateAndRemoveSupervisedUser) { DISABLED_PRE_PRE_PRE_CreateAndRemoveSupervisedUser) {
PrepareUsers(); PrepareUsers();
} }
IN_PROC_BROWSER_TEST_F(SupervisedUserCreationTest, IN_PROC_BROWSER_TEST_F(SupervisedUserCreationTest,
PRE_PRE_CreateAndRemoveSupervisedUser) { DISABLED_PRE_PRE_CreateAndRemoveSupervisedUser) {
StartFlowLoginAsManager(); StartFlowLoginAsManager();
FillNewUserData(kTestSupervisedUserDisplayName); FillNewUserData(kTestSupervisedUserDisplayName);
StartUserCreation("managed-user-creation-next-button", StartUserCreation("managed-user-creation-next-button",
...@@ -103,22 +103,22 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserCreationTest, ...@@ -103,22 +103,22 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserCreationTest,
} }
IN_PROC_BROWSER_TEST_F(SupervisedUserCreationTest, IN_PROC_BROWSER_TEST_F(SupervisedUserCreationTest,
PRE_CreateAndRemoveSupervisedUser) { DISABLED_PRE_CreateAndRemoveSupervisedUser) {
SigninAsSupervisedUser(true, 0, kTestSupervisedUserDisplayName); SigninAsSupervisedUser(true, 0, kTestSupervisedUserDisplayName);
} }
IN_PROC_BROWSER_TEST_F(SupervisedUserCreationTest, IN_PROC_BROWSER_TEST_F(SupervisedUserCreationTest,
CreateAndRemoveSupervisedUser) { DISABLED_CreateAndRemoveSupervisedUser) {
RemoveSupervisedUser(3, 0, kTestSupervisedUserDisplayName); RemoveSupervisedUser(3, 0, kTestSupervisedUserDisplayName);
} }
IN_PROC_BROWSER_TEST_F(SupervisedUserOwnerCreationTest, IN_PROC_BROWSER_TEST_F(SupervisedUserOwnerCreationTest,
PRE_PRE_PRE_CreateAndRemoveSupervisedUser) { DISABLED_PRE_PRE_PRE_CreateAndRemoveSupervisedUser) {
PrepareUsers(); PrepareUsers();
} }
IN_PROC_BROWSER_TEST_F(SupervisedUserOwnerCreationTest, IN_PROC_BROWSER_TEST_F(SupervisedUserOwnerCreationTest,
PRE_PRE_CreateAndRemoveSupervisedUser) { DISABLED_PRE_PRE_CreateAndRemoveSupervisedUser) {
StartFlowLoginAsManager(); StartFlowLoginAsManager();
FillNewUserData(kTestSupervisedUserDisplayName); FillNewUserData(kTestSupervisedUserDisplayName);
StartUserCreation("managed-user-creation-next-button", StartUserCreation("managed-user-creation-next-button",
...@@ -126,22 +126,22 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserOwnerCreationTest, ...@@ -126,22 +126,22 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserOwnerCreationTest,
} }
IN_PROC_BROWSER_TEST_F(SupervisedUserOwnerCreationTest, IN_PROC_BROWSER_TEST_F(SupervisedUserOwnerCreationTest,
PRE_CreateAndRemoveSupervisedUser) { DISABLED_PRE_CreateAndRemoveSupervisedUser) {
SigninAsSupervisedUser(true, 0, kTestSupervisedUserDisplayName); SigninAsSupervisedUser(true, 0, kTestSupervisedUserDisplayName);
} }
IN_PROC_BROWSER_TEST_F(SupervisedUserOwnerCreationTest, IN_PROC_BROWSER_TEST_F(SupervisedUserOwnerCreationTest,
CreateAndRemoveSupervisedUser) { DISABLED_CreateAndRemoveSupervisedUser) {
RemoveSupervisedUser(3, 0, kTestSupervisedUserDisplayName); RemoveSupervisedUser(3, 0, kTestSupervisedUserDisplayName);
} }
IN_PROC_BROWSER_TEST_F(SupervisedUserTransactionCleanupTest, IN_PROC_BROWSER_TEST_F(SupervisedUserTransactionCleanupTest,
PRE_PRE_CreateAndCancelSupervisedUser) { DISABLED_PRE_PRE_CreateAndCancelSupervisedUser) {
PrepareUsers(); PrepareUsers();
} }
IN_PROC_BROWSER_TEST_F(SupervisedUserTransactionCleanupTest, IN_PROC_BROWSER_TEST_F(SupervisedUserTransactionCleanupTest,
PRE_CreateAndCancelSupervisedUser) { DISABLED_PRE_CreateAndCancelSupervisedUser) {
StartFlowLoginAsManager(); StartFlowLoginAsManager();
FillNewUserData(kTestSupervisedUserDisplayName); FillNewUserData(kTestSupervisedUserDisplayName);
...@@ -167,7 +167,7 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserTransactionCleanupTest, ...@@ -167,7 +167,7 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserTransactionCleanupTest,
IN_PROC_BROWSER_TEST_( IN_PROC_BROWSER_TEST_(
SupervisedUserTransactionCleanupTest, SupervisedUserTransactionCleanupTest,
CreateAndCancelSupervisedUser, DISABLED_CreateAndCancelSupervisedUser,
SupervisedUserTransactionCleanupTest2, SupervisedUserTransactionCleanupTest2,
testing::internal::GetTypeId<SupervisedUserTransactionCleanupTest>()) { testing::internal::GetTypeId<SupervisedUserTransactionCleanupTest>()) {
// Make sure there is no supervised user in list. // Make sure there is no supervised user in list.
......
...@@ -60,12 +60,12 @@ class SupervisedUserPasswordManagerTest : public ManagedUserTestBase { ...@@ -60,12 +60,12 @@ class SupervisedUserPasswordManagerTest : public ManagedUserTestBase {
}; };
IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,
PRE_PRE_PRE_PasswordChangeFromUserTest) { DISABLED_PRE_PRE_PRE_PasswordChangeFromUserTest) {
PrepareUsers(); PrepareUsers();
} }
IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,
PRE_PRE_PasswordChangeFromUserTest) { DISABLED_PRE_PRE_PasswordChangeFromUserTest) {
StartFlowLoginAsManager(); StartFlowLoginAsManager();
FillNewUserData(kTestSupervisedUserDisplayName); FillNewUserData(kTestSupervisedUserDisplayName);
StartUserCreation("managed-user-creation-next-button", StartUserCreation("managed-user-creation-next-button",
...@@ -75,7 +75,7 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, ...@@ -75,7 +75,7 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,
// Supervised user signs in, get sync notification about password update, and // Supervised user signs in, get sync notification about password update, and
// schedules password migration. // schedules password migration.
IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,
PRE_PasswordChangeFromUserTest) { DISABLED_PRE_PasswordChangeFromUserTest) {
SigninAsSupervisedUser(true, 0, kTestSupervisedUserDisplayName); SigninAsSupervisedUser(true, 0, kTestSupervisedUserDisplayName);
const User* user = UserManager::Get()->GetUsers().at(0); const User* user = UserManager::Get()->GetUsers().at(0);
...@@ -98,7 +98,8 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, ...@@ -98,7 +98,8 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,
// Supervised user signs in for second time, and actual password migration takes // Supervised user signs in for second time, and actual password migration takes
// place. // place.
IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, PasswordChangeFromUserTest) { IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,
DISABLED_PasswordChangeFromUserTest) {
EXPECT_CALL(*mock_homedir_methods_, MountEx(_, _, _, _)).Times(1); EXPECT_CALL(*mock_homedir_methods_, MountEx(_, _, _, _)).Times(1);
EXPECT_CALL(*mock_homedir_methods_, UpdateKeyEx(_, _, _, _, _)).Times(1); EXPECT_CALL(*mock_homedir_methods_, UpdateKeyEx(_, _, _, _, _)).Times(1);
SigninAsSupervisedUser(false, 0, kTestSupervisedUserDisplayName); SigninAsSupervisedUser(false, 0, kTestSupervisedUserDisplayName);
...@@ -106,12 +107,12 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, PasswordChangeFromUserTest) { ...@@ -106,12 +107,12 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, PasswordChangeFromUserTest) {
} }
IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,
PRE_PRE_PRE_PasswordChangeFromManagerTest) { DISABLED_PRE_PRE_PRE_PasswordChangeFromManagerTest) {
PrepareUsers(); PrepareUsers();
} }
IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,
PRE_PRE_PasswordChangeFromManagerTest) { DISABLED_PRE_PRE_PasswordChangeFromManagerTest) {
StartFlowLoginAsManager(); StartFlowLoginAsManager();
FillNewUserData(kTestSupervisedUserDisplayName); FillNewUserData(kTestSupervisedUserDisplayName);
StartUserCreation("managed-user-creation-next-button", StartUserCreation("managed-user-creation-next-button",
...@@ -121,7 +122,7 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, ...@@ -121,7 +122,7 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,
// Manager signs in, gets sync notification about supervised user password // Manager signs in, gets sync notification about supervised user password
// update, and performs migration. // update, and performs migration.
IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,
PRE_PasswordChangeFromManagerTest) { DISABLED_PRE_PasswordChangeFromManagerTest) {
const User* managed_user = UserManager::Get()->GetUsers().at(0); const User* managed_user = UserManager::Get()->GetUsers().at(0);
SigninAsManager(1); SigninAsManager(1);
...@@ -161,20 +162,21 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, ...@@ -161,20 +162,21 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,
// After that supervised user signs in, and no password change happens. // After that supervised user signs in, and no password change happens.
IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,
PasswordChangeFromManagerTest) { DISABLED_PasswordChangeFromManagerTest) {
EXPECT_CALL(*mock_homedir_methods_, MountEx(_, _, _, _)).Times(1); EXPECT_CALL(*mock_homedir_methods_, MountEx(_, _, _, _)).Times(1);
EXPECT_CALL(*mock_homedir_methods_, UpdateKeyEx(_, _, _, _, _)).Times(0); EXPECT_CALL(*mock_homedir_methods_, UpdateKeyEx(_, _, _, _, _)).Times(0);
SigninAsSupervisedUser(false, 1, kTestSupervisedUserDisplayName); SigninAsSupervisedUser(false, 1, kTestSupervisedUserDisplayName);
testing::Mock::VerifyAndClearExpectations(mock_homedir_methods_); testing::Mock::VerifyAndClearExpectations(mock_homedir_methods_);
} }
IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, IN_PROC_BROWSER_TEST_F(
PRE_PRE_PRE_PRE_PasswordChangeUserAndManagerTest) { SupervisedUserPasswordTest,
DISABLED_PRE_PRE_PRE_PRE_PasswordChangeUserAndManagerTest) {
PrepareUsers(); PrepareUsers();
} }
IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,
PRE_PRE_PRE_PasswordChangeUserAndManagerTest) { DISABLED_PRE_PRE_PRE_PasswordChangeUserAndManagerTest) {
StartFlowLoginAsManager(); StartFlowLoginAsManager();
FillNewUserData(kTestSupervisedUserDisplayName); FillNewUserData(kTestSupervisedUserDisplayName);
StartUserCreation("managed-user-creation-next-button", StartUserCreation("managed-user-creation-next-button",
...@@ -184,7 +186,7 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, ...@@ -184,7 +186,7 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,
// Supervised user signs in, get sync notification about password update, and // Supervised user signs in, get sync notification about password update, and
// schedules password migration. // schedules password migration.
IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,
PRE_PRE_PasswordChangeUserAndManagerTest) { DISABLED_PRE_PRE_PasswordChangeUserAndManagerTest) {
SigninAsSupervisedUser(true, 0, kTestSupervisedUserDisplayName); SigninAsSupervisedUser(true, 0, kTestSupervisedUserDisplayName);
const User* user = UserManager::Get()->GetUsers().at(0); const User* user = UserManager::Get()->GetUsers().at(0);
...@@ -208,7 +210,7 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, ...@@ -208,7 +210,7 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,
// After that manager signs in, and also detects password change. Manager // After that manager signs in, and also detects password change. Manager
// performs the migration. // performs the migration.
IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,
PRE_PasswordChangeUserAndManagerTest) { DISABLED_PRE_PasswordChangeUserAndManagerTest) {
const User* managed_user = UserManager::Get()->GetUsers().at(0); const User* managed_user = UserManager::Get()->GetUsers().at(0);
SigninAsManager(1); SigninAsManager(1);
...@@ -249,7 +251,7 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, ...@@ -249,7 +251,7 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,
// When supervised user signs in, password is already migrated, so no migration // When supervised user signs in, password is already migrated, so no migration
// should be attempted. // should be attempted.
IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,
PasswordChangeUserAndManagerTest) { DISABLED_PasswordChangeUserAndManagerTest) {
EXPECT_CALL(*mock_homedir_methods_, MountEx(_, _, _, _)).Times(1); EXPECT_CALL(*mock_homedir_methods_, MountEx(_, _, _, _)).Times(1);
EXPECT_CALL(*mock_homedir_methods_, UpdateKeyEx(_, _, _, _, _)).Times(0); EXPECT_CALL(*mock_homedir_methods_, UpdateKeyEx(_, _, _, _, _)).Times(0);
SigninAsSupervisedUser(false, 1, kTestSupervisedUserDisplayName); SigninAsSupervisedUser(false, 1, kTestSupervisedUserDisplayName);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment