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

Side by Side Diff: chrome/browser/sync/test/integration/two_client_apps_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 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/basictypes.h" 5 #include "base/basictypes.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/apps_helper.h" 7 #include "chrome/browser/sync/test/integration/apps_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 apps_helper::AllProfilesHaveSameAppsAsVerifier; 10 using apps_helper::AllProfilesHaveSameAppsAsVerifier;
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 } 256 }
257 257
258 // TCM ID - 3720303. 258 // TCM ID - 3720303.
259 IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest, DisableSync) { 259 IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest, DisableSync) {
260 ASSERT_TRUE(SetupSync()); 260 ASSERT_TRUE(SetupSync());
261 ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier()); 261 ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
262 262
263 ASSERT_TRUE(GetClient(1)->DisableSyncForAllDatatypes()); 263 ASSERT_TRUE(GetClient(1)->DisableSyncForAllDatatypes());
264 InstallApp(GetProfile(0), 0); 264 InstallApp(GetProfile(0), 0);
265 InstallApp(verifier(), 0); 265 InstallApp(verifier(), 0);
266 ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion("Installed an app.")); 266 ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion("Installed an app."));
267 ASSERT_TRUE(HasSameAppsAsVerifier(0)); 267 ASSERT_TRUE(HasSameAppsAsVerifier(0));
268 ASSERT_FALSE(HasSameAppsAsVerifier(1)); 268 ASSERT_FALSE(HasSameAppsAsVerifier(1));
269 269
270 ASSERT_TRUE(GetClient(1)->EnableSyncForAllDatatypes()); 270 ASSERT_TRUE(GetClient(1)->EnableSyncForAllDatatypes());
271 ASSERT_TRUE(AwaitQuiescence()); 271 ASSERT_TRUE(AwaitQuiescence());
272 272
273 InstallAppsPendingForSync(GetProfile(0)); 273 InstallAppsPendingForSync(GetProfile(0));
274 InstallAppsPendingForSync(GetProfile(1)); 274 InstallAppsPendingForSync(GetProfile(1));
275 ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier()); 275 ASSERT_TRUE(AllProfilesHaveSameAppsAsVerifier());
276 } 276 }
277 277
278 // TODO(akalin): Add tests exercising: 278 // TODO(akalin): Add tests exercising:
279 // - Offline installation/uninstallation behavior 279 // - Offline installation/uninstallation behavior
280 // - App-specific properties 280 // - App-specific properties
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698