commit 76ad59ea95d48f29f5b8658d467d6323789f1b51
author hbos <hbos@chromium.org> Tue Sep 20 14:53:06 2016
committer Commit bot <commit-bot@chromium.org> Tue Sep 20 14:55:11 2016
tree cd4504d668c540a728728a33997b3ee13160f67d
parent 2a09506ffa8daa34d6a95a4760e33673e9b245de

Disable flaky MigrationSingleClientTest tests.

These are reported as flaky. Though locally they fail every time?

Disabling:
- MigrationSingleClientTest.AllTypesAtOnce
- MigrationSingleClientTest.AllTypesAtOnceTriggerNotification
- MigrationSingleClientTest.AllTypesWithNigoriAtOnce
- MigrationSingleClientTest.BookmarksPrefsBoth
- MigrationSingleClientTest.BookmarksPrefsIndividually
- MigrationSingleClientTest.NigoriOnly
- MigrationSingleClientTest.PrefsNigoriBoth
- MigrationSingleClientTest.PrefsOnlyModifyBookmark
- MigrationSingleClientTest.PrefsOnlyModifyPref
- MigrationSingleClientTest.PrefsOnlyTriggerNotification

With this, *ALL* MigrationSingleClientTests that were not already
disabled are disabled. This bug needs to be investigated and the tests
re-enabled.

BUG=648480
NOTRY=True
TBR=lgcheng,stevenjb,pavely

Review-Url: https://codereview.chromium.org/2353953002
Cr-Commit-Position: refs/heads/master@{#419757}

chrome/browser/sync/test/integration/migration_test.cc

diff --git a/chrome/browser/sync/test/integration/migration_test.cc b/chrome/browser/sync/test/integration/migration_test.cc
index 13ddb01..0431a0e9 100644
--- a/chrome/browser/sync/test/integration/migration_test.cc
+++ b/chrome/browser/sync/test/integration/migration_test.cc
@@ -240,37 +240,40 @@
 
 // The simplest possible migration tests -- a single data type.
 
-IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, PrefsOnlyModifyPref) {
+IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest,
+                       DISABLED_PrefsOnlyModifyPref) {
   RunSingleClientMigrationTest(MakeList(syncer::PREFERENCES), MODIFY_PREF);
 }
 
-IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, PrefsOnlyModifyBookmark) {
+IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest,
+                       DISABLED_PrefsOnlyModifyBookmark) {
   RunSingleClientMigrationTest(MakeList(syncer::PREFERENCES),
                                MODIFY_BOOKMARK);
 }
 
 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest,
-                       PrefsOnlyTriggerNotification) {
+                       DISABLED_PrefsOnlyTriggerNotification) {
   RunSingleClientMigrationTest(MakeList(syncer::PREFERENCES),
                                TRIGGER_NOTIFICATION);
 }
 
 // Nigori is handled specially, so we test that separately.
 
-IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, NigoriOnly) {
+IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, DISABLED_NigoriOnly) {
   RunSingleClientMigrationTest(MakeList(syncer::PREFERENCES),
                                TRIGGER_NOTIFICATION);
 }
 
 // A little more complicated -- two data types.
 
-IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, BookmarksPrefsIndividually) {
+IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest,
+                       DISABLED_BookmarksPrefsIndividually) {
   RunSingleClientMigrationTest(
       MakeList(syncer::BOOKMARKS, syncer::PREFERENCES),
       MODIFY_PREF);
 }
 
-IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, BookmarksPrefsBoth) {
+IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, DISABLED_BookmarksPrefsBoth) {
   RunSingleClientMigrationTest(
       MakeList(MakeSet(syncer::BOOKMARKS, syncer::PREFERENCES)),
       MODIFY_BOOKMARK);
@@ -286,7 +289,7 @@
       TRIGGER_NOTIFICATION);
 }
 
-IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, PrefsNigoriBoth) {
+IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, DISABLED_PrefsNigoriBoth) {
   RunSingleClientMigrationTest(
       MakeList(MakeSet(syncer::PREFERENCES, syncer::NIGORI)),
       MODIFY_PREF);
@@ -308,14 +311,14 @@
                                TRIGGER_NOTIFICATION);
 }
 
-IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, AllTypesAtOnce) {
+IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, DISABLED_AllTypesAtOnce) {
   ASSERT_TRUE(SetupClients());
   RunSingleClientMigrationTest(MakeList(GetPreferredDataTypes()),
                                MODIFY_PREF);
 }
 
 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest,
-                       AllTypesAtOnceTriggerNotification) {
+                       DISABLED_AllTypesAtOnceTriggerNotification) {
   ASSERT_TRUE(SetupClients());
   RunSingleClientMigrationTest(MakeList(GetPreferredDataTypes()),
                                TRIGGER_NOTIFICATION);
@@ -332,7 +335,8 @@
   RunSingleClientMigrationTest(migration_list, MODIFY_BOOKMARK);
 }
 
-IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, AllTypesWithNigoriAtOnce) {
+IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest,
+                       DISABLED_AllTypesWithNigoriAtOnce) {
   ASSERT_TRUE(SetupClients());
   syncer::ModelTypeSet all_types = GetPreferredDataTypes();
   all_types.Put(syncer::NIGORI);