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

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

Issue 8568033: Re-enable stress sync integration tests (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 9 years, 1 month 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
« no previous file with comments | « no previous file | chrome/browser/sync/test/integration/many_client_passwords_sync_test.cc » ('j') | 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 "chrome/browser/profiles/profile.h" 5 #include "chrome/browser/profiles/profile.h"
6 #include "chrome/browser/sync/profile_sync_service_harness.h" 6 #include "chrome/browser/sync/profile_sync_service_harness.h"
7 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" 7 #include "chrome/browser/sync/test/integration/bookmarks_helper.h"
8 #include "chrome/browser/sync/test/integration/sync_test.h" 8 #include "chrome/browser/sync/test/integration/sync_test.h"
9 9
10 using bookmarks_helper::AddURL; 10 using bookmarks_helper::AddURL;
11 using bookmarks_helper::AllModelsMatch; 11 using bookmarks_helper::AllModelsMatch;
12 12
13 class ManyClientBookmarksSyncTest : public SyncTest { 13 class ManyClientBookmarksSyncTest : public SyncTest {
14 public: 14 public:
15 ManyClientBookmarksSyncTest() : SyncTest(MANY_CLIENT) {} 15 ManyClientBookmarksSyncTest() : SyncTest(MANY_CLIENT) {}
16 virtual ~ManyClientBookmarksSyncTest() {} 16 virtual ~ManyClientBookmarksSyncTest() {}
17 17
18 private: 18 private:
19 DISALLOW_COPY_AND_ASSIGN(ManyClientBookmarksSyncTest); 19 DISALLOW_COPY_AND_ASSIGN(ManyClientBookmarksSyncTest);
20 }; 20 };
21 21
22 // TODO(rsimha): Enable once http://crbug.com/69604 is fixed. 22 IN_PROC_BROWSER_TEST_F(ManyClientBookmarksSyncTest, Sanity) {
23 IN_PROC_BROWSER_TEST_F(ManyClientBookmarksSyncTest, DISABLED_Sanity) {
24 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; 23 ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
25 ASSERT_TRUE(AddURL(0, L"Google URL", GURL("http://www.google.com/")) != NULL); 24 ASSERT_TRUE(AddURL(0, L"Google URL", GURL("http://www.google.com/")) != NULL);
26 ASSERT_TRUE(GetClient(0)->AwaitGroupSyncCycleCompletion(clients())); 25 ASSERT_TRUE(GetClient(0)->AwaitGroupSyncCycleCompletion(clients()));
27 ASSERT_TRUE(AllModelsMatch()); 26 ASSERT_TRUE(AllModelsMatch());
28 } 27 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/sync/test/integration/many_client_passwords_sync_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698