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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/sync/test/integration/two_client_bookmarks_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_autofill_sync_test.cc ('k') | chrome/browser/sync/test/integration/two_client_extensions_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_bookmarks_sync_test.cc

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

index 0c5946880ef405a77c311228e957e75b1c4e0401..5c8791ae56e13fa607bec269029d08f968ea07d2 100644

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

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

@@ -1517,7 +1517,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, DisableSync) {

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

ASSERT_TRUE(AddFolder(0, IndexedFolderName(0)) != NULL);

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

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

ASSERT_FALSE(AllModelsMatch());

ASSERT_TRUE(AddFolder(1, IndexedFolderName(1)) != NULL);