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

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

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

index 3257b2d59c42f02824131d61516e21da85a8b3c3..76c2dffd4f5cbadcca33a33ac9db63580bbfe14a 100644

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

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

@@ -40,7 +40,7 @@ IN_PROC_BROWSER_TEST_F(SingleClientThemesSyncTest, CustomTheme) {

ASSERT_EQ(GetCustomTheme(0), GetThemeID(GetProfile(0)));

ASSERT_EQ(GetCustomTheme(0), GetThemeID(verifier()));

- ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion(

+ ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion(

"Waiting for custom themes change."));

ASSERT_EQ(GetCustomTheme(0), GetThemeID(GetProfile(0)));

@@ -60,7 +60,7 @@ IN_PROC_BROWSER_TEST_F(SingleClientThemesSyncTest, NativeTheme) {

ASSERT_FALSE(UsingNativeTheme(GetProfile(0)));

ASSERT_FALSE(UsingNativeTheme(verifier()));

- ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion(

+ ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion(

"Waiting for custom themes change."));

UseNativeTheme(GetProfile(0));

@@ -68,7 +68,7 @@ IN_PROC_BROWSER_TEST_F(SingleClientThemesSyncTest, NativeTheme) {

ASSERT_TRUE(UsingNativeTheme(GetProfile(0)));

ASSERT_TRUE(UsingNativeTheme(verifier()));

- ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion(

+ ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion(

"Waiting for native themes change."));

ASSERT_TRUE(UsingNativeTheme(GetProfile(0)));

@@ -83,7 +83,7 @@ IN_PROC_BROWSER_TEST_F(SingleClientThemesSyncTest, DefaultTheme) {

ASSERT_FALSE(UsingDefaultTheme(GetProfile(0)));

ASSERT_FALSE(UsingDefaultTheme(verifier()));

- ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion(

+ ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion(

"Waiting for custom themes change."));

UseDefaultTheme(GetProfile(0));

@@ -91,7 +91,7 @@ IN_PROC_BROWSER_TEST_F(SingleClientThemesSyncTest, DefaultTheme) {

ASSERT_TRUE(UsingDefaultTheme(GetProfile(0)));

ASSERT_TRUE(UsingDefaultTheme(verifier()));

- ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion(

+ ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion(

"Waiting for native themes change."));

ASSERT_TRUE(UsingDefaultTheme(GetProfile(0)));