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

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

Issue 735123002: Disables TwoClientAppsSyncTest.StartWithDifferentApps as its flaky (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 | 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "base/strings/utf_string_conversions.h" 6 #include "base/strings/utf_string_conversions.h"
7 #include "chrome/browser/chrome_notification_types.h" 7 #include "chrome/browser/chrome_notification_types.h"
8 #include "chrome/browser/extensions/app_sync_data.h" 8 #include "chrome/browser/extensions/app_sync_data.h"
9 #include "chrome/browser/extensions/bookmark_app_helper.h" 9 #include "chrome/browser/extensions/bookmark_app_helper.h"
10 #include "chrome/browser/extensions/extension_service.h" 10 #include "chrome/browser/extensions/extension_service.h"
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 } 82 }
83 83
84 ASSERT_TRUE(SetupSync()); 84 ASSERT_TRUE(SetupSync());
85 85
86 ASSERT_TRUE(AwaitAllProfilesHaveSameAppsAsVerifier()); 86 ASSERT_TRUE(AwaitAllProfilesHaveSameAppsAsVerifier());
87 } 87 }
88 88
89 // Install some apps on both clients, some on only one client, some on only the 89 // Install some apps on both clients, some on only one client, some on only the
90 // other, and sync. Both clients should end up with all apps, and the app and 90 // other, and sync. Both clients should end up with all apps, and the app and
91 // page ordinals should be identical. 91 // page ordinals should be identical.
92 IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest, StartWithDifferentApps) { 92 // Disabled, see http://crbug.com/434438 for details.
93 IN_PROC_BROWSER_TEST_F(TwoClientAppsSyncTest, DISABLED_StartWithDifferentApps) {
93 ASSERT_TRUE(SetupClients()); 94 ASSERT_TRUE(SetupClients());
94 95
95 int i = 0; 96 int i = 0;
96 97
97 const int kNumCommonApps = 5; 98 const int kNumCommonApps = 5;
98 for (int j = 0; j < kNumCommonApps; ++i, ++j) { 99 for (int j = 0; j < kNumCommonApps; ++i, ++j) {
99 InstallApp(GetProfile(0), i); 100 InstallApp(GetProfile(0), i);
100 InstallApp(GetProfile(1), i); 101 InstallApp(GetProfile(1), i);
101 InstallApp(verifier(), i); 102 InstallApp(verifier(), i);
102 } 103 }
(...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after
462 content::WindowedNotificationObserver windowed_observer( 463 content::WindowedNotificationObserver windowed_observer(
463 extensions::NOTIFICATION_CRX_INSTALLER_DONE, 464 extensions::NOTIFICATION_CRX_INSTALLER_DONE,
464 base::Bind(&AllProfilesHaveSameAppsAsVerifier)); 465 base::Bind(&AllProfilesHaveSameAppsAsVerifier));
465 windowed_observer.Wait(); 466 windowed_observer.Wait();
466 } 467 }
467 } 468 }
468 469
469 // TODO(akalin): Add tests exercising: 470 // TODO(akalin): Add tests exercising:
470 // - Offline installation/uninstallation behavior 471 // - Offline installation/uninstallation behavior
471 // - App-specific properties 472 // - App-specific properties
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