chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc - Issue 7861013: Fix the false-positive detection of commit errors

Unified Diff: chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc

Issue 7861013: Fix the false-positive detection of commit errors (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Another attempt at detecting errors Created 9 years, 2 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/sync/test/integration/two_client_extensions_sync_test.cc ('k') | chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc

diff --git a/chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc b/chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc

index 2161f4cdae78a23018aea4c05bd7bc460594e577..74341495887fba3edb9f865a468f1388057346f8 100644

--- a/chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc

+++ b/chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc

@@ -120,7 +120,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest, DisableSync) {

AddLogin(GetPasswordStore(0), form);

ASSERT_EQ(1, GetPasswordCount(0));

- ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion("Added a password."));

+ ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion("Added a password."));

ASSERT_TRUE(ProfileContainsSamePasswordFormsAsVerifier(0));

ASSERT_FALSE(ProfileContainsSamePasswordFormsAsVerifier(1));

@@ -144,7 +144,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest, SetPassphrase) {

SetPassphrase(1, kValidPassphrase);

ASSERT_TRUE(GetClient(1)->AwaitPassphraseAccepted());

- ASSERT_TRUE(GetClient(1)->AwaitSyncCycleCompletion("Set passphrase."));

+ ASSERT_TRUE(GetClient(1)->AwaitFullSyncCompletion("Set passphrase."));

}

// TODO(sync): Enable after MockKeychain is fixed. http://crbug.com/89808.

@@ -283,12 +283,12 @@ IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest,

ASSERT_TRUE(GetClient(0)->SetupSync());

SetPassphrase(0, kValidPassphrase);

ASSERT_TRUE(GetClient(0)->AwaitPassphraseAccepted());

- ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion("Initial sync."));

+ ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion("Initial sync."));

ASSERT_FALSE(GetClient(1)->SetupSync());

SetPassphrase(1, kValidPassphrase);

ASSERT_TRUE(GetClient(1)->AwaitPassphraseAccepted());

- ASSERT_TRUE(GetClient(1)->AwaitSyncCycleCompletion("Initial sync."));

+ ASSERT_TRUE(GetClient(1)->AwaitFullSyncCompletion("Initial sync."));

// Following ensures types are enabled and active (see bug 87572).

browser_sync::ModelSafeRoutingInfo routes;

@@ -315,9 +315,9 @@ IN_PROC_BROWSER_TEST_F(TwoClientPasswordsSyncTest,

SetPassphrase(1, kValidPassphrase);

ASSERT_TRUE(GetClient(1)->AwaitPassphraseAccepted());

- ASSERT_TRUE(GetClient(1)->AwaitSyncCycleCompletion("Set passphrase."));

+ ASSERT_TRUE(GetClient(1)->AwaitFullSyncCompletion("Set passphrase."));

SetPassphrase(1, kValidPassphrase);

ASSERT_TRUE(GetClient(1)->AwaitPassphraseAccepted());

- ASSERT_TRUE(GetClient(1)->AwaitSyncCycleCompletion("Set passphrase again."));

+ ASSERT_TRUE(GetClient(1)->AwaitFullSyncCompletion("Set passphrase again."));

}