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

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

Issue 471993002: Disable MigrationSingleClientTest.AllTypesIndividually* since they're timing out sometimes on Windo… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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
« 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/backend_migrator.h" 9 #include "chrome/browser/sync/backend_migrator.h"
10 #include "chrome/browser/sync/profile_sync_service.h" 10 #include "chrome/browser/sync/profile_sync_service.h"
(...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after
368 TRIGGER_NOTIFICATION); 368 TRIGGER_NOTIFICATION);
369 } 369 }
370 370
371 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, PrefsNigoriBoth) { 371 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, PrefsNigoriBoth) {
372 RunSingleClientMigrationTest( 372 RunSingleClientMigrationTest(
373 MakeList(MakeSet(syncer::PREFERENCES, syncer::NIGORI)), 373 MakeList(MakeSet(syncer::PREFERENCES, syncer::NIGORI)),
374 MODIFY_PREF); 374 MODIFY_PREF);
375 } 375 }
376 376
377 // The whole shebang -- all data types. 377 // The whole shebang -- all data types.
378 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, AllTypesIndividually) { 378 #if defined(OS_WIN)
379 // http://crbug.com/403778
380 #define MAYBE_AllTypesIndividually DISABLED_AllTypesIndividually
381 #else
382 #define MAYBE_AllTypesIndividually AllTypesIndividually
383 #endif
384 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, MAYBE_AllTypesIndividually) {
379 ASSERT_TRUE(SetupClients()); 385 ASSERT_TRUE(SetupClients());
380 RunSingleClientMigrationTest(GetPreferredDataTypesList(), MODIFY_BOOKMARK); 386 RunSingleClientMigrationTest(GetPreferredDataTypesList(), MODIFY_BOOKMARK);
381 } 387 }
382 388
389 #if defined(OS_WIN)
390 // http://crbug.com/403778
391 #define MAYBE_AllTypesIndividuallyTriggerNotification DISABLED_AllTypesIndividua llyTriggerNotification
392 #else
393 #define MAYBE_AllTypesIndividuallyTriggerNotification AllTypesIndividuallyTrigge rNotification
394 #endif
383 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, 395 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest,
384 AllTypesIndividuallyTriggerNotification) { 396 MAYBE_AllTypesIndividuallyTriggerNotification) {
385 ASSERT_TRUE(SetupClients()); 397 ASSERT_TRUE(SetupClients());
386 RunSingleClientMigrationTest(GetPreferredDataTypesList(), 398 RunSingleClientMigrationTest(GetPreferredDataTypesList(),
387 TRIGGER_NOTIFICATION); 399 TRIGGER_NOTIFICATION);
388 } 400 }
389 401
390 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, AllTypesAtOnce) { 402 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, AllTypesAtOnce) {
391 ASSERT_TRUE(SetupClients()); 403 ASSERT_TRUE(SetupClients());
392 RunSingleClientMigrationTest(MakeList(GetPreferredDataTypes()), 404 RunSingleClientMigrationTest(MakeList(GetPreferredDataTypes()),
393 MODIFY_PREF); 405 MODIFY_PREF);
394 } 406 }
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
506 // Do not add optional datatypes. 518 // Do not add optional datatypes.
507 } 519 }
508 520
509 virtual ~MigrationReconfigureTest() {} 521 virtual ~MigrationReconfigureTest() {}
510 522
511 private: 523 private:
512 DISALLOW_COPY_AND_ASSIGN(MigrationReconfigureTest); 524 DISALLOW_COPY_AND_ASSIGN(MigrationReconfigureTest);
513 }; 525 };
514 526
515 } // namespace 527 } // 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