Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(276)

Side by Side Diff: chrome/browser/chromeos/login/managed/managed_user_password_browsertest.cc

Issue 305473004: Temporary disable supervised user ChromeOS tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/chromeos/login/managed/managed_user_creation_browsertest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <string> 5 #include <string>
6 6
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "base/run_loop.h" 8 #include "base/run_loop.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "base/threading/sequenced_worker_pool.h" 10 #include "base/threading/sequenced_worker_pool.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 53
54 class SupervisedUserPasswordManagerTest : public ManagedUserTestBase { 54 class SupervisedUserPasswordManagerTest : public ManagedUserTestBase {
55 public: 55 public:
56 SupervisedUserPasswordManagerTest() : ManagedUserTestBase() {} 56 SupervisedUserPasswordManagerTest() : ManagedUserTestBase() {}
57 57
58 private: 58 private:
59 DISALLOW_COPY_AND_ASSIGN(SupervisedUserPasswordManagerTest); 59 DISALLOW_COPY_AND_ASSIGN(SupervisedUserPasswordManagerTest);
60 }; 60 };
61 61
62 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, 62 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,
63 PRE_PRE_PRE_PasswordChangeFromUserTest) { 63 DISABLED_PRE_PRE_PRE_PasswordChangeFromUserTest) {
64 PrepareUsers(); 64 PrepareUsers();
65 } 65 }
66 66
67 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, 67 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,
68 PRE_PRE_PasswordChangeFromUserTest) { 68 DISABLED_PRE_PRE_PasswordChangeFromUserTest) {
69 StartFlowLoginAsManager(); 69 StartFlowLoginAsManager();
70 FillNewUserData(kTestSupervisedUserDisplayName); 70 FillNewUserData(kTestSupervisedUserDisplayName);
71 StartUserCreation("managed-user-creation-next-button", 71 StartUserCreation("managed-user-creation-next-button",
72 kTestSupervisedUserDisplayName); 72 kTestSupervisedUserDisplayName);
73 } 73 }
74 74
75 // Supervised user signs in, get sync notification about password update, and 75 // Supervised user signs in, get sync notification about password update, and
76 // schedules password migration. 76 // schedules password migration.
77 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, 77 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,
78 PRE_PasswordChangeFromUserTest) { 78 DISABLED_PRE_PasswordChangeFromUserTest) {
79 SigninAsSupervisedUser(true, 0, kTestSupervisedUserDisplayName); 79 SigninAsSupervisedUser(true, 0, kTestSupervisedUserDisplayName);
80 80
81 const User* user = UserManager::Get()->GetUsers().at(0); 81 const User* user = UserManager::Get()->GetUsers().at(0);
82 std::string sync_id = 82 std::string sync_id =
83 UserManager::Get()->GetSupervisedUserManager()->GetUserSyncId( 83 UserManager::Get()->GetSupervisedUserManager()->GetUserSyncId(
84 user->email()); 84 user->email());
85 base::DictionaryValue password; 85 base::DictionaryValue password;
86 password.SetIntegerWithoutPathExpansion( 86 password.SetIntegerWithoutPathExpansion(
87 kSchemaVersion, SupervisedUserAuthentication::SCHEMA_SALT_HASHED); 87 kSchemaVersion, SupervisedUserAuthentication::SCHEMA_SALT_HASHED);
88 password.SetIntegerWithoutPathExpansion(kPasswordRevision, 2); 88 password.SetIntegerWithoutPathExpansion(kPasswordRevision, 2);
89 89
90 password.SetStringWithoutPathExpansion(kPasswordSignature, "signature"); 90 password.SetStringWithoutPathExpansion(kPasswordSignature, "signature");
91 password.SetStringWithoutPathExpansion(kEncryptedPassword, 91 password.SetStringWithoutPathExpansion(kEncryptedPassword,
92 "new-encrypted-password"); 92 "new-encrypted-password");
93 93
94 shared_settings_adapter_->AddChange( 94 shared_settings_adapter_->AddChange(
95 sync_id, managed_users::kChromeOSPasswordData, password, true, false); 95 sync_id, managed_users::kChromeOSPasswordData, password, true, false);
96 content::RunAllPendingInMessageLoop(); 96 content::RunAllPendingInMessageLoop();
97 } 97 }
98 98
99 // Supervised user signs in for second time, and actual password migration takes 99 // Supervised user signs in for second time, and actual password migration takes
100 // place. 100 // place.
101 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, PasswordChangeFromUserTest) { 101 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,
102 DISABLED_PasswordChangeFromUserTest) {
102 EXPECT_CALL(*mock_homedir_methods_, MountEx(_, _, _, _)).Times(1); 103 EXPECT_CALL(*mock_homedir_methods_, MountEx(_, _, _, _)).Times(1);
103 EXPECT_CALL(*mock_homedir_methods_, UpdateKeyEx(_, _, _, _, _)).Times(1); 104 EXPECT_CALL(*mock_homedir_methods_, UpdateKeyEx(_, _, _, _, _)).Times(1);
104 SigninAsSupervisedUser(false, 0, kTestSupervisedUserDisplayName); 105 SigninAsSupervisedUser(false, 0, kTestSupervisedUserDisplayName);
105 testing::Mock::VerifyAndClearExpectations(mock_homedir_methods_); 106 testing::Mock::VerifyAndClearExpectations(mock_homedir_methods_);
106 } 107 }
107 108
108 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, 109 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,
109 PRE_PRE_PRE_PasswordChangeFromManagerTest) { 110 DISABLED_PRE_PRE_PRE_PasswordChangeFromManagerTest) {
110 PrepareUsers(); 111 PrepareUsers();
111 } 112 }
112 113
113 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, 114 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,
114 PRE_PRE_PasswordChangeFromManagerTest) { 115 DISABLED_PRE_PRE_PasswordChangeFromManagerTest) {
115 StartFlowLoginAsManager(); 116 StartFlowLoginAsManager();
116 FillNewUserData(kTestSupervisedUserDisplayName); 117 FillNewUserData(kTestSupervisedUserDisplayName);
117 StartUserCreation("managed-user-creation-next-button", 118 StartUserCreation("managed-user-creation-next-button",
118 kTestSupervisedUserDisplayName); 119 kTestSupervisedUserDisplayName);
119 } 120 }
120 121
121 // Manager signs in, gets sync notification about supervised user password 122 // Manager signs in, gets sync notification about supervised user password
122 // update, and performs migration. 123 // update, and performs migration.
123 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, 124 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,
124 PRE_PasswordChangeFromManagerTest) { 125 DISABLED_PRE_PasswordChangeFromManagerTest) {
125 const User* managed_user = UserManager::Get()->GetUsers().at(0); 126 const User* managed_user = UserManager::Get()->GetUsers().at(0);
126 127
127 SigninAsManager(1); 128 SigninAsManager(1);
128 129
129 EXPECT_CALL(*mock_homedir_methods_, AddKeyEx(_, _, _, _, _)).Times(1); 130 EXPECT_CALL(*mock_homedir_methods_, AddKeyEx(_, _, _, _, _)).Times(1);
130 131
131 std::string sync_id = 132 std::string sync_id =
132 UserManager::Get()->GetSupervisedUserManager()->GetUserSyncId( 133 UserManager::Get()->GetSupervisedUserManager()->GetUserSyncId(
133 managed_user->email()); 134 managed_user->email());
134 135
(...skipping 19 matching lines...) Expand all
154 "new-encrypted-password"); 155 "new-encrypted-password");
155 shared_settings_adapter_->AddChange( 156 shared_settings_adapter_->AddChange(
156 sync_id, managed_users::kChromeOSPasswordData, password, true, false); 157 sync_id, managed_users::kChromeOSPasswordData, password, true, false);
157 content::RunAllPendingInMessageLoop(); 158 content::RunAllPendingInMessageLoop();
158 159
159 testing::Mock::VerifyAndClearExpectations(mock_homedir_methods_); 160 testing::Mock::VerifyAndClearExpectations(mock_homedir_methods_);
160 } 161 }
161 162
162 // After that supervised user signs in, and no password change happens. 163 // After that supervised user signs in, and no password change happens.
163 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, 164 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,
164 PasswordChangeFromManagerTest) { 165 DISABLED_PasswordChangeFromManagerTest) {
165 EXPECT_CALL(*mock_homedir_methods_, MountEx(_, _, _, _)).Times(1); 166 EXPECT_CALL(*mock_homedir_methods_, MountEx(_, _, _, _)).Times(1);
166 EXPECT_CALL(*mock_homedir_methods_, UpdateKeyEx(_, _, _, _, _)).Times(0); 167 EXPECT_CALL(*mock_homedir_methods_, UpdateKeyEx(_, _, _, _, _)).Times(0);
167 SigninAsSupervisedUser(false, 1, kTestSupervisedUserDisplayName); 168 SigninAsSupervisedUser(false, 1, kTestSupervisedUserDisplayName);
168 testing::Mock::VerifyAndClearExpectations(mock_homedir_methods_); 169 testing::Mock::VerifyAndClearExpectations(mock_homedir_methods_);
169 } 170 }
170 171
171 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, 172 IN_PROC_BROWSER_TEST_F(
172 PRE_PRE_PRE_PRE_PasswordChangeUserAndManagerTest) { 173 SupervisedUserPasswordTest,
174 DISABLED_PRE_PRE_PRE_PRE_PasswordChangeUserAndManagerTest) {
173 PrepareUsers(); 175 PrepareUsers();
174 } 176 }
175 177
176 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, 178 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,
177 PRE_PRE_PRE_PasswordChangeUserAndManagerTest) { 179 DISABLED_PRE_PRE_PRE_PasswordChangeUserAndManagerTest) {
178 StartFlowLoginAsManager(); 180 StartFlowLoginAsManager();
179 FillNewUserData(kTestSupervisedUserDisplayName); 181 FillNewUserData(kTestSupervisedUserDisplayName);
180 StartUserCreation("managed-user-creation-next-button", 182 StartUserCreation("managed-user-creation-next-button",
181 kTestSupervisedUserDisplayName); 183 kTestSupervisedUserDisplayName);
182 } 184 }
183 185
184 // Supervised user signs in, get sync notification about password update, and 186 // Supervised user signs in, get sync notification about password update, and
185 // schedules password migration. 187 // schedules password migration.
186 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, 188 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,
187 PRE_PRE_PasswordChangeUserAndManagerTest) { 189 DISABLED_PRE_PRE_PasswordChangeUserAndManagerTest) {
188 SigninAsSupervisedUser(true, 0, kTestSupervisedUserDisplayName); 190 SigninAsSupervisedUser(true, 0, kTestSupervisedUserDisplayName);
189 191
190 const User* user = UserManager::Get()->GetUsers().at(0); 192 const User* user = UserManager::Get()->GetUsers().at(0);
191 std::string sync_id = 193 std::string sync_id =
192 UserManager::Get()->GetSupervisedUserManager()->GetUserSyncId( 194 UserManager::Get()->GetSupervisedUserManager()->GetUserSyncId(
193 user->email()); 195 user->email());
194 base::DictionaryValue password; 196 base::DictionaryValue password;
195 password.SetIntegerWithoutPathExpansion( 197 password.SetIntegerWithoutPathExpansion(
196 kSchemaVersion, SupervisedUserAuthentication::SCHEMA_SALT_HASHED); 198 kSchemaVersion, SupervisedUserAuthentication::SCHEMA_SALT_HASHED);
197 password.SetIntegerWithoutPathExpansion(kPasswordRevision, 2); 199 password.SetIntegerWithoutPathExpansion(kPasswordRevision, 2);
198 200
199 password.SetStringWithoutPathExpansion(kPasswordSignature, "signature"); 201 password.SetStringWithoutPathExpansion(kPasswordSignature, "signature");
200 password.SetStringWithoutPathExpansion(kEncryptedPassword, 202 password.SetStringWithoutPathExpansion(kEncryptedPassword,
201 "new-encrypted-password"); 203 "new-encrypted-password");
202 204
203 shared_settings_adapter_->AddChange( 205 shared_settings_adapter_->AddChange(
204 sync_id, managed_users::kChromeOSPasswordData, password, true, false); 206 sync_id, managed_users::kChromeOSPasswordData, password, true, false);
205 content::RunAllPendingInMessageLoop(); 207 content::RunAllPendingInMessageLoop();
206 } 208 }
207 209
208 // After that manager signs in, and also detects password change. Manager 210 // After that manager signs in, and also detects password change. Manager
209 // performs the migration. 211 // performs the migration.
210 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, 212 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,
211 PRE_PasswordChangeUserAndManagerTest) { 213 DISABLED_PRE_PasswordChangeUserAndManagerTest) {
212 const User* managed_user = UserManager::Get()->GetUsers().at(0); 214 const User* managed_user = UserManager::Get()->GetUsers().at(0);
213 215
214 SigninAsManager(1); 216 SigninAsManager(1);
215 217
216 EXPECT_CALL(*mock_homedir_methods_, AddKeyEx(_, _, _, _, _)).Times(1); 218 EXPECT_CALL(*mock_homedir_methods_, AddKeyEx(_, _, _, _, _)).Times(1);
217 219
218 std::string sync_id = 220 std::string sync_id =
219 UserManager::Get()->GetSupervisedUserManager()->GetUserSyncId( 221 UserManager::Get()->GetSupervisedUserManager()->GetUserSyncId(
220 managed_user->email()); 222 managed_user->email());
221 223
(...skipping 20 matching lines...) Expand all
242 shared_settings_adapter_->AddChange( 244 shared_settings_adapter_->AddChange(
243 sync_id, managed_users::kChromeOSPasswordData, password, true, false); 245 sync_id, managed_users::kChromeOSPasswordData, password, true, false);
244 content::RunAllPendingInMessageLoop(); 246 content::RunAllPendingInMessageLoop();
245 247
246 testing::Mock::VerifyAndClearExpectations(mock_homedir_methods_); 248 testing::Mock::VerifyAndClearExpectations(mock_homedir_methods_);
247 } 249 }
248 250
249 // When supervised user signs in, password is already migrated, so no migration 251 // When supervised user signs in, password is already migrated, so no migration
250 // should be attempted. 252 // should be attempted.
251 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest, 253 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,
252 PasswordChangeUserAndManagerTest) { 254 DISABLED_PasswordChangeUserAndManagerTest) {
253 EXPECT_CALL(*mock_homedir_methods_, MountEx(_, _, _, _)).Times(1); 255 EXPECT_CALL(*mock_homedir_methods_, MountEx(_, _, _, _)).Times(1);
254 EXPECT_CALL(*mock_homedir_methods_, UpdateKeyEx(_, _, _, _, _)).Times(0); 256 EXPECT_CALL(*mock_homedir_methods_, UpdateKeyEx(_, _, _, _, _)).Times(0);
255 SigninAsSupervisedUser(false, 1, kTestSupervisedUserDisplayName); 257 SigninAsSupervisedUser(false, 1, kTestSupervisedUserDisplayName);
256 testing::Mock::VerifyAndClearExpectations(mock_homedir_methods_); 258 testing::Mock::VerifyAndClearExpectations(mock_homedir_methods_);
257 } 259 }
258 260
259 } // namespace chromeos 261 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/managed/managed_user_creation_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698