chrome/browser/sync/test/integration/sync_errors_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/sync_errors_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/single_client_typed_urls_sync_test.cc ('k') | chrome/browser/sync/test/integration/sync_test.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index ef6a724c54b24fc4c6633affb181c4ba0d4515e6..21f2e07a9a1381a5e285cbf2a7dc5da91aee7b9b 100644

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

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

@@ -25,7 +25,7 @@ IN_PROC_BROWSER_TEST_F(SyncErrorTest, BirthdayErrorTest) {

const BookmarkNode* node1 = AddFolder(0, 0, L"title1");

SetTitle(0, node1, L"new_title1");

- ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion("Offline state change."));

+ ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion("Offline state change."));

TriggerBirthdayError();

// Now make one more change so we will do another sync.

@@ -39,7 +39,7 @@ IN_PROC_BROWSER_TEST_F(SyncErrorTest, TransientErrorTest) {

const BookmarkNode* node1 = AddFolder(0, 0, L"title1");

SetTitle(0, node1, L"new_title1");

- ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion("Offline state change."));

+ ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion("Offline state change."));

TriggerTransientError();

// Now make one more change so we will do another sync.

@@ -54,9 +54,9 @@ IN_PROC_BROWSER_TEST_F(SyncErrorTest, ActionableErrorTest) {

const BookmarkNode* node1 = AddFolder(0, 0, L"title1");

SetTitle(0, node1, L"new_title1");

- ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion("Sync."));

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

- browser_sync::SyncProtocolError protocol_error;

+ browser_sync::SyncOperationResult protocol_error;

protocol_error.error_type = browser_sync::TRANSIENT_ERROR;

protocol_error.action = browser_sync::UPGRADE_CLIENT;

protocol_error.error_description = "Not My Fault";

@@ -82,9 +82,9 @@ IN_PROC_BROWSER_TEST_F(SyncErrorTest,

const BookmarkNode* node1 = AddFolder(0, 0, L"title1");

SetTitle(0, node1, L"new_title1");

- ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion("Sync."));

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

- browser_sync::SyncProtocolError protocol_error;

+ browser_sync::SyncOperationResult protocol_error;

protocol_error.error_type = browser_sync::NOT_MY_BIRTHDAY;

protocol_error.action = browser_sync::DISABLE_SYNC_ON_CLIENT;

protocol_error.error_description = "Not My Fault";