chrome/browser/sync/test/integration/two_client_printers_sync_test.cc - Issue 2738243002: [Sync] Enable Sync_integration_tests on chromeos

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_printers_sync_test.cc

Issue 2738243002: [Sync] Enable Sync_integration_tests on chromeos (Closed)

Patch Set: disable failed tests Created 3 years, 9 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

« chrome/browser/sync/test/integration/enable_disable_test.cc ('K') | « chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc ('k') | testing/buildbot/chromium.chromiumos.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 96338833df49c594bf8f26f862e9ccc849289b86..8889ae92c660372d1b09089e25e1649bbb0d7973 100644

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

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

@@ -128,7 +128,13 @@ IN_PROC_BROWSER_TEST_F(TwoClientPrintersSyncTest, ConflictResolution) {

EXPECT_EQ(valid_message, GetPrinterStore(1)->GetPrinters()[0]->description());

}

-IN_PROC_BROWSER_TEST_F(TwoClientPrintersSyncTest, SimpleMerge) {

+#if defined(OS_CHROMEOS)

+// http://crbug.com/689662

+#define MAYBE_SimpleMerge DISABLED_SimpleMerge

+#else

+#define MAYBE_SimpleMerge SimpleMerge

+#endif

+IN_PROC_BROWSER_TEST_F(TwoClientPrintersSyncTest, MAYBE_SimpleMerge) {

ASSERT_TRUE(SetupClients());

base::RunLoop().RunUntilIdle();