Abort sync cycles when download step fails

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // TODO(akalin): Rename this file to migration_test.cc.
 
 #include "base/compiler_specific.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
@@ skipping 164 matching lines @@
     // AwaitQuiescence() will not succeed when notifications are disabled.  We
     // can safely avoid calling it because we know that, in the single client
     // case, there is no one else to wait for.
     //
     // TODO(rlarocque, 97780): Remove the if condition when the test harness
     // supports calling AwaitQuiescence() when notifications are disabled.
     if (!do_test_without_notifications) {
       AwaitQuiescence();
     }
 
-    // Re-enable notifications if we disabled it.
-    if (do_test_without_notifications) {
-      EnableNotifications();
-    }
+    // TODO(rlarocque): It should be possible to re-enable notifications
+    // here, but doing so makes some windows tests flaky.
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MigrationTest);
 };
 
 class MigrationSingleClientTest : public MigrationTest {
  public:
   MigrationSingleClientTest() : MigrationTest(SINGLE_CLIENT) {}
   virtual ~MigrationSingleClientTest() {}
@@ skipping 45 matching lines @@
 }
 
 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, BookmarksPrefsBoth) {
   RunSingleClientMigrationTest(
       MakeList(MakeSet(syncable::BOOKMARKS, syncable::PREFERENCES)),
       MODIFY_BOOKMARK);
 }
 
 // Two data types with one being nigori.
 
+// See crbug.com/124480.
 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest,
                        DISABLED_PrefsNigoriIndividiaully) {
   RunSingleClientMigrationTest(
       MakeList(syncable::PREFERENCES, syncable::NIGORI),
       TRIGGER_NOTIFICATION);
 }
 
-// TODO(rlarocque): Re-enable this test when crbug.com/122033 is fixed.
-IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, DISABLED_PrefsNigoriBoth) {
+IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, PrefsNigoriBoth) {
   RunSingleClientMigrationTest(
       MakeList(MakeSet(syncable::PREFERENCES, syncable::NIGORI)),
       MODIFY_PREF);
 }
 
 // The whole shebang -- all data types.
 
 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest, AllTypesIndividually) {
   ASSERT_TRUE(SetupClients());
   RunSingleClientMigrationTest(GetPreferredDataTypesList(), MODIFY_BOOKMARK);
@@ skipping 14 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest,
                        AllTypesAtOnceTriggerNotification) {
   ASSERT_TRUE(SetupClients());
   RunSingleClientMigrationTest(MakeList(GetPreferredDataTypes()),
                                TRIGGER_NOTIFICATION);
 }
 
 // All data types plus nigori.
 
+// See crbug.com/124480.
 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest,
                        DISABLED_AllTypesWithNigoriIndividually) {
   ASSERT_TRUE(SetupClients());
   MigrationList migration_list = GetPreferredDataTypesList();
   migration_list.push_front(MakeSet(syncable::NIGORI));
   RunSingleClientMigrationTest(migration_list, MODIFY_BOOKMARK);
 }
 
-// TODO(rlarocque): Re-enable this test when crbug.com/122033 is fixed.
 IN_PROC_BROWSER_TEST_F(MigrationSingleClientTest,
-                       DISABLED_AllTypesWithNigoriAtOnce) {
+                       AllTypesWithNigoriAtOnce) {
   ASSERT_TRUE(SetupClients());
   syncable::ModelTypeSet all_types = GetPreferredDataTypes();
   all_types.Put(syncable::NIGORI);
   RunSingleClientMigrationTest(MakeList(all_types), MODIFY_PREF);
 }
 
 class MigrationTwoClientTest : public MigrationTest {
  public:
   MigrationTwoClientTest() : MigrationTest(TWO_CLIENT) {}
   virtual ~MigrationTwoClientTest() {}
@@ skipping 20 matching lines @@
 
     // Make sure pref sync still works after running the migration
     // test.
     VerifyPrefSync();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MigrationTwoClientTest);
 };
 
-#if defined(OS_MACOSX)
-#define MAYBE_MigratePrefsThenModifyBookmark DISABLED_MigratePrefsThenModifyBookmark
-#else
-#define MAYBE_MigratePrefsThenModifyBookmark MigratePrefsThenModifyBookmark
-#endif
 // Easiest possible test of migration errors: triggers a server
 // migration on one datatype, then modifies some other datatype.
-IN_PROC_BROWSER_TEST_F(MigrationTwoClientTest,
-                       MAYBE_MigratePrefsThenModifyBookmark) {
+IN_PROC_BROWSER_TEST_F(MigrationTwoClientTest, MigratePrefsThenModifyBookmark) {
   RunTwoClientMigrationTest(MakeList(syncable::PREFERENCES),
                             MODIFY_BOOKMARK);
 }
 
 // Triggers a server migration on two datatypes, then makes a local
 // modification to one of them.
 IN_PROC_BROWSER_TEST_F(MigrationTwoClientTest,
                        MigratePrefsAndBookmarksThenModifyBookmark) {
   RunTwoClientMigrationTest(
       MakeList(syncable::PREFERENCES, syncable::BOOKMARKS),
       MODIFY_BOOKMARK);
 }
 
 // Migrate every datatype in sequence; the catch being that the server
 // will only tell the client about the migrations one at a time.
 IN_PROC_BROWSER_TEST_F(MigrationTwoClientTest, MigrationHellWithoutNigori) {
   ASSERT_TRUE(SetupClients());
   MigrationList migration_list = GetPreferredDataTypesList();
   // Let the first nudge be a datatype that's neither prefs nor
   // bookmarks.
   migration_list.push_front(MakeSet(syncable::THEMES));
   RunTwoClientMigrationTest(migration_list, MODIFY_BOOKMARK);
 }
 
-// TODO(rlarocque) Re-enable this test when crbug.com/122033 is fixed.
+// See crbug.com/124480.
 IN_PROC_BROWSER_TEST_F(MigrationTwoClientTest,
                        DISABLED_MigrationHellWithNigori) {
   ASSERT_TRUE(SetupClients());
   MigrationList migration_list = GetPreferredDataTypesList();
   // Let the first nudge be a datatype that's neither prefs nor
   // bookmarks.
   migration_list.push_front(MakeSet(syncable::THEMES));
   // Pop off one so that we don't migrate all data types; the syncer
   // freaks out if we do that (see http://crbug.com/94882).
   ASSERT_GE(migration_list.size(), 2u);
@@ skipping 10 matching lines @@
     AddTestSwitches(cl);
     // Do not add optional datatypes.
   }
 
   virtual ~MigrationReconfigureTest() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MigrationReconfigureTest);
 };
 
-IN_PROC_BROWSER_TEST_F(MigrationReconfigureTest, DISABLED_SetSyncTabs) {
+IN_PROC_BROWSER_TEST_F(MigrationReconfigureTest,
+                       DISABLED_SetSyncTabs) {
   if (!ServerSupportsErrorTriggering()) {
     LOG(WARNING) << "Test skipped in this server environment.";
     return;
   }
 
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
   ASSERT_FALSE(GetClient(0)->IsTypeRunning(syncable::SESSIONS));
   ASSERT_FALSE(GetClient(0)->IsTypePreferred(syncable::SESSIONS));
 
   // Phase 1: Before migrating anything, create & sync a preference.
@@ skipping 36 matching lines @@
 
   // Phase 5: Verify that preferences can still be synchronized.
   VerifyPrefSync();
 
   // Phase 6: Verify that sessions are registered and enabled.
   ASSERT_TRUE(GetClient(0)->IsTypeRunning(syncable::SESSIONS));
   ASSERT_TRUE(GetClient(0)->IsTypePreferred(syncable::SESSIONS));
 }
 
 }  // namespace