Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(537)

Side by Side Diff: chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc

Issue 7841014: Mark SC_AddFirstBMWithFavicon as failing on Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 3 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/rand_util.h" 5 #include "base/rand_util.h"
6 #include "chrome/browser/profiles/profile.h" 6 #include "chrome/browser/profiles/profile.h"
7 #include "chrome/browser/sync/profile_sync_service_harness.h" 7 #include "chrome/browser/sync/profile_sync_service_harness.h"
8 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" 8 #include "chrome/browser/sync/test/integration/bookmarks_helper.h"
9 #include "chrome/browser/sync/test/integration/sync_test.h" 9 #include "chrome/browser/sync/test/integration/sync_test.h"
10 10
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 SC_AddFirstBMWithoutFavicon) { 124 SC_AddFirstBMWithoutFavicon) {
125 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; 125 ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
126 ASSERT_TRUE(AllModelsMatchVerifier()); 126 ASSERT_TRUE(AllModelsMatchVerifier());
127 127
128 ASSERT_TRUE(AddURL(0, kGenericURLTitle, GURL(kGenericURL)) != NULL); 128 ASSERT_TRUE(AddURL(0, kGenericURLTitle, GURL(kGenericURL)) != NULL);
129 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); 129 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
130 ASSERT_TRUE(AllModelsMatchVerifier()); 130 ASSERT_TRUE(AllModelsMatchVerifier());
131 } 131 }
132 132
133 // Test Scribe ID - 370489. 133 // Test Scribe ID - 370489.
134 // TODO(rsimha): Enable after http://crbug.com/94941 is fixed.
135 #if defined(OS_MACOSX)
136 IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
137 FAILS_SC_AddFirstBMWithFavicon) {
138 #else
134 IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, 139 IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
135 SC_AddFirstBMWithFavicon) { 140 SC_AddFirstBMWithFavicon) {
141 #endif
136 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; 142 ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
137 ASSERT_TRUE(AllModelsMatchVerifier()); 143 ASSERT_TRUE(AllModelsMatchVerifier());
138 144
139 const BookmarkNode* bookmark = AddURL(0, kGenericURLTitle, GURL(kGenericURL)); 145 const BookmarkNode* bookmark = AddURL(0, kGenericURLTitle, GURL(kGenericURL));
140 ASSERT_TRUE(bookmark != NULL); 146 ASSERT_TRUE(bookmark != NULL);
141 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); 147 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
142 SetFavicon(0, bookmark, GenericFavicon()); 148 SetFavicon(0, bookmark, GenericFavicon());
143 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); 149 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
144 ASSERT_TRUE(AllModelsMatchVerifier()); 150 ASSERT_TRUE(AllModelsMatchVerifier());
145 } 151 }
(...skipping 1602 matching lines...) Expand 10 before | Expand all | Expand 10 after
1748 1754
1749 ASSERT_TRUE(AddURL(0, IndexedURLTitle(1), GURL(IndexedURL(1))) != NULL); 1755 ASSERT_TRUE(AddURL(0, IndexedURLTitle(1), GURL(IndexedURL(1))) != NULL);
1750 ASSERT_TRUE(AddFolder(0, IndexedFolderName(0)) != NULL); 1756 ASSERT_TRUE(AddFolder(0, IndexedFolderName(0)) != NULL);
1751 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); 1757 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
1752 ASSERT_TRUE(AllModelsMatchVerifier()); 1758 ASSERT_TRUE(AllModelsMatchVerifier());
1753 } 1759 }
1754 1760
1755 // TODO(zea): Add first time sync functionality testing. In particular, when 1761 // TODO(zea): Add first time sync functionality testing. In particular, when
1756 // there are encrypted types in first time sync we need to ensure we don't 1762 // there are encrypted types in first time sync we need to ensure we don't
1757 // duplicate bookmarks. 1763 // duplicate bookmarks.
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698