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

Side by Side Diff: chrome/test/live_sync/two_client_live_bookmarks_sync_test.cc

Issue 6826007: Mark some sync tests as flaky. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: "" Created 9 years, 8 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
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 "base/stringprintf.h" 6 #include "base/stringprintf.h"
7 #include "chrome/browser/profiles/profile.h" 7 #include "chrome/browser/profiles/profile.h"
8 #include "chrome/browser/sync/profile_sync_service_harness.h" 8 #include "chrome/browser/sync/profile_sync_service_harness.h"
9 #include "chrome/test/live_sync/live_bookmarks_sync_test.h" 9 #include "chrome/test/live_sync/live_bookmarks_sync_test.h"
10 10
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 SC_AddFirstBMWithoutFavicon) { 116 SC_AddFirstBMWithoutFavicon) {
117 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; 117 ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
118 ASSERT_TRUE(AllModelsMatchVerifier()); 118 ASSERT_TRUE(AllModelsMatchVerifier());
119 119
120 ASSERT_TRUE(AddURL(0, kGenericURLTitle, GURL(kGenericURL)) != NULL); 120 ASSERT_TRUE(AddURL(0, kGenericURLTitle, GURL(kGenericURL)) != NULL);
121 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); 121 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
122 ASSERT_TRUE(AllModelsMatchVerifier()); 122 ASSERT_TRUE(AllModelsMatchVerifier());
123 } 123 }
124 124
125 // Test Scribe ID - 370489. 125 // Test Scribe ID - 370489.
126 // TODO(rsimha): See http://crbug.com/78840.
126 IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest, 127 IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest,
127 SC_AddFirstBMWithFavicon) { 128 FLAKY_SC_AddFirstBMWithFavicon) {
128 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; 129 ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
129 ASSERT_TRUE(AllModelsMatchVerifier()); 130 ASSERT_TRUE(AllModelsMatchVerifier());
130 131
131 const BookmarkNode* bookmark = AddURL(0, kGenericURLTitle, GURL(kGenericURL)); 132 const BookmarkNode* bookmark = AddURL(0, kGenericURLTitle, GURL(kGenericURL));
132 ASSERT_TRUE(bookmark != NULL); 133 ASSERT_TRUE(bookmark != NULL);
133 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); 134 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
134 SetFavicon(0, bookmark, GenericFavicon()); 135 SetFavicon(0, bookmark, GenericFavicon());
135 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); 136 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
136 ASSERT_TRUE(AllModelsMatchVerifier()); 137 ASSERT_TRUE(AllModelsMatchVerifier());
137 } 138 }
(...skipping 1334 matching lines...) Expand 10 before | Expand all | Expand 10 after
1472 } 1473 }
1473 1474
1474 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; 1475 ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
1475 ASSERT_TRUE(AwaitQuiescence()); 1476 ASSERT_TRUE(AwaitQuiescence());
1476 ASSERT_TRUE(AllModelsMatch()); 1477 ASSERT_TRUE(AllModelsMatch());
1477 1478
1478 for (int i = 1; i < 5 ; ++i) { 1479 for (int i = 1; i < 5 ; ++i) {
1479 ASSERT_TRUE(CountBookmarksWithTitlesMatching(1, IndexedURLTitle(i)) == i); 1480 ASSERT_TRUE(CountBookmarksWithTitlesMatching(1, IndexedURLTitle(i)) == i);
1480 } 1481 }
1481 } 1482 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698