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

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

Issue 616093004: Disable to sync_integration_tests that fail consistently on OSX. (Closed) Base URL: https://chromium.googlesource.com/a/chromium/src.git@master
Patch Set: Created 6 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
« 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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/compiler_specific.h" 5 #include "base/compiler_specific.h"
6 #include "base/memory/scoped_vector.h" 6 #include "base/memory/scoped_vector.h"
7 #include "base/prefs/scoped_user_pref_update.h" 7 #include "base/prefs/scoped_user_pref_update.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/sync/profile_sync_service.h" 9 #include "chrome/browser/sync/profile_sync_service.h"
10 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" 10 #include "chrome/browser/sync/test/integration/bookmarks_helper.h"
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 TRIGGER_NOTIFICATION); 276 TRIGGER_NOTIFICATION);
277 } 277 }
278 278
279 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, PrefsNigoriBoth) { 279 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, PrefsNigoriBoth) {
280 RunSingleClientMigrationTest( 280 RunSingleClientMigrationTest(
281 MakeList(MakeSet(syncer::PREFERENCES, syncer::NIGORI)), 281 MakeList(MakeSet(syncer::PREFERENCES, syncer::NIGORI)),
282 MODIFY_PREF); 282 MODIFY_PREF);
283 } 283 }
284 284
285 // The whole shebang -- all data types. 285 // The whole shebang -- all data types.
286 #if defined(OS_WIN) 286 #if defined(OS_WIN) || defined(OS_MACOSX)
287 // http://crbug.com/403778 287 // http://crbug.com/403778
288 #define MAYBE_AllTypesIndividually DISABLED_AllTypesIndividually 288 #define MAYBE_AllTypesIndividually DISABLED_AllTypesIndividually
289 #else 289 #else
290 #define MAYBE_AllTypesIndividually AllTypesIndividually 290 #define MAYBE_AllTypesIndividually AllTypesIndividually
291 #endif 291 #endif
292 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, MAYBE_AllTypesIndividually) { 292 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, MAYBE_AllTypesIndividually) {
293 ASSERT_TRUE(SetupClients()); 293 ASSERT_TRUE(SetupClients());
294 RunSingleClientMigrationTest(GetPreferredDataTypesList(), MODIFY_BOOKMARK); 294 RunSingleClientMigrationTest(GetPreferredDataTypesList(), MODIFY_BOOKMARK);
295 } 295 }
296 296
297 #if defined(OS_WIN) 297 #if defined(OS_WIN) || defined(OS_MACOSX)
298 // http://crbug.com/403778 298 // http://crbug.com/403778
299 #define MAYBE_AllTypesIndividuallyTriggerNotification DISABLED_AllTypesIndividua llyTriggerNotification 299 #define MAYBE_AllTypesIndividuallyTriggerNotification DISABLED_AllTypesIndividua llyTriggerNotification
300 #else 300 #else
301 #define MAYBE_AllTypesIndividuallyTriggerNotification AllTypesIndividuallyTrigge rNotification 301 #define MAYBE_AllTypesIndividuallyTriggerNotification AllTypesIndividuallyTrigge rNotification
302 #endif 302 #endif
303 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, 303 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest,
304 MAYBE_AllTypesIndividuallyTriggerNotification) { 304 MAYBE_AllTypesIndividuallyTriggerNotification) {
305 ASSERT_TRUE(SetupClients()); 305 ASSERT_TRUE(SetupClients());
306 RunSingleClientMigrationTest(GetPreferredDataTypesList(), 306 RunSingleClientMigrationTest(GetPreferredDataTypesList(),
307 TRIGGER_NOTIFICATION); 307 TRIGGER_NOTIFICATION);
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
426 // Do not add optional datatypes. 426 // Do not add optional datatypes.
427 } 427 }
428 428
429 virtual ~MigrationReconfigureTest() {} 429 virtual ~MigrationReconfigureTest() {}
430 430
431 private: 431 private:
432 DISALLOW_COPY_AND_ASSIGN(MigrationReconfigureTest); 432 DISALLOW_COPY_AND_ASSIGN(MigrationReconfigureTest);
433 }; 433 };
434 434
435 } // namespace 435 } // namespace
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