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

Side by Side Diff: chrome/browser/sync/test/integration/many_client_passwords_sync_test.cc

Issue 8587038: Revert 110450 - Re-enable stress sync integration tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 1 month 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "base/utf_string_conversions.h" 5 #include "base/utf_string_conversions.h"
6 #include "chrome/browser/password_manager/password_form_data.h" 6 #include "chrome/browser/password_manager/password_form_data.h"
7 #include "chrome/browser/sync/profile_sync_service_harness.h" 7 #include "chrome/browser/sync/profile_sync_service_harness.h"
8 #include "chrome/browser/sync/test/integration/sync_test.h" 8 #include "chrome/browser/sync/test/integration/sync_test.h"
9 #include "chrome/browser/sync/test/integration/passwords_helper.h" 9 #include "chrome/browser/sync/test/integration/passwords_helper.h"
10 10
11 using passwords_helper::AddLogin; 11 using passwords_helper::AddLogin;
12 using passwords_helper::AllProfilesContainSamePasswordFormsAsVerifier; 12 using passwords_helper::AllProfilesContainSamePasswordFormsAsVerifier;
13 using passwords_helper::CreateTestPasswordForm; 13 using passwords_helper::CreateTestPasswordForm;
14 using passwords_helper::GetPasswordCount; 14 using passwords_helper::GetPasswordCount;
15 using passwords_helper::GetPasswordStore; 15 using passwords_helper::GetPasswordStore;
16 using passwords_helper::GetVerifierPasswordCount; 16 using passwords_helper::GetVerifierPasswordCount;
17 using passwords_helper::GetVerifierPasswordStore; 17 using passwords_helper::GetVerifierPasswordStore;
18 18
19 using webkit_glue::PasswordForm; 19 using webkit_glue::PasswordForm;
20 20
21 class ManyClientPasswordsSyncTest : public SyncTest { 21 class ManyClientPasswordsSyncTest : public SyncTest {
22 public: 22 public:
23 ManyClientPasswordsSyncTest() : SyncTest(MANY_CLIENT) {} 23 ManyClientPasswordsSyncTest() : SyncTest(MANY_CLIENT) {}
24 virtual ~ManyClientPasswordsSyncTest() {} 24 virtual ~ManyClientPasswordsSyncTest() {}
25 25
26 private: 26 private:
27 DISALLOW_COPY_AND_ASSIGN(ManyClientPasswordsSyncTest); 27 DISALLOW_COPY_AND_ASSIGN(ManyClientPasswordsSyncTest);
28 }; 28 };
29 29
30 IN_PROC_BROWSER_TEST_F(ManyClientPasswordsSyncTest, Sanity) { 30 // TODO(rsimha): Enable once http://crbug.com/69604 is fixed.
31 IN_PROC_BROWSER_TEST_F(ManyClientPasswordsSyncTest, DISABLED_Sanity) {
31 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; 32 ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
32 33
33 PasswordForm form = CreateTestPasswordForm(0); 34 PasswordForm form = CreateTestPasswordForm(0);
34 AddLogin(GetVerifierPasswordStore(), form); 35 AddLogin(GetVerifierPasswordStore(), form);
35 ASSERT_EQ(1, GetVerifierPasswordCount()); 36 ASSERT_EQ(1, GetVerifierPasswordCount());
36 AddLogin(GetPasswordStore(0), form); 37 AddLogin(GetPasswordStore(0), form);
37 ASSERT_EQ(1, GetPasswordCount(0)); 38 ASSERT_EQ(1, GetPasswordCount(0));
38 ASSERT_TRUE(GetClient(0)->AwaitGroupSyncCycleCompletion(clients())); 39 ASSERT_TRUE(GetClient(0)->AwaitGroupSyncCycleCompletion(clients()));
39 40
40 ASSERT_TRUE(AllProfilesContainSamePasswordFormsAsVerifier()); 41 ASSERT_TRUE(AllProfilesContainSamePasswordFormsAsVerifier());
41 ASSERT_EQ(1, GetPasswordCount(0)); 42 ASSERT_EQ(1, GetPasswordCount(0));
42 } 43 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698