[Sync] Make BackendMigrator not wait for full sync cycles

chrome/test/live_sync/migration_errors_test.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service_harness.h"
 #include "chrome/browser/translate/translate_prefs.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/ui_test_utils.h"
@@ skipping 38 matching lines @@
   // Phase 2: Modify a pref (to trigger migration) and wait for a sync
   // cycle.
   // TODO(akalin): Shouldn't need to wait for full sync cycle; see
   // 93167.
   ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
   ChangeBooleanPref(0, prefs::kShowHomeButton);
   ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion("Migration"));
 }
 
 // TODO(akalin): Fails due to http://crbug.com/92928.
-IN_PROC_BROWSER_TEST_F(MigrationCycleTest, FAILS_PrefsNigori) {
+IN_PROC_BROWSER_TEST_F(MigrationCycleTest, PrefsNigori) {
   if (!ServerSupportsErrorTriggering()) {
     LOG(WARNING) << "Test skipped in this server environment.";
     return;
   }
 
   DisableNotifications();
 
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   // Phase 1: Trigger a preference and nigori migration on the server.
   {
     syncable::ModelTypeSet migrate_types;
     migrate_types.insert(syncable::PREFERENCES);
     TriggerMigrationDoneError(migrate_types);
   }
   {
     syncable::ModelTypeSet migrate_types;
     migrate_types.insert(syncable::NIGORI);
     TriggerMigrationDoneError(migrate_types);
   }
 
   // Phase 2: Modify a pref (to trigger migration) and wait for a sync
   // cycle.
   // TODO(akalin): Shouldn't need to wait for full sync cycle; see
   // 93167.
   ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
   ChangeBooleanPref(0, prefs::kShowHomeButton);
   ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion("Migration"));

[akalin, 2011/08/19 01:34:28]

TODO: wait for configure to be done instead of a full cycle

 }
 
 // TODO(akalin): Fails due to http://crbug.com/92928.
-IN_PROC_BROWSER_TEST_F(MigrationCycleTest, FAILS_BookmarksPrefs) {
+IN_PROC_BROWSER_TEST_F(MigrationCycleTest, BookmarksPrefs) {
   if (!ServerSupportsErrorTriggering()) {
     LOG(WARNING) << "Test skipped in this server environment.";
     return;
   }
 
   DisableNotifications();
 
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
   // Phase 1: Trigger a bookmark and preference migration on the
   // server.
   {
     syncable::ModelTypeSet migrate_types;
     migrate_types.insert(syncable::BOOKMARKS);
     TriggerMigrationDoneError(migrate_types);
   }
   {
     syncable::ModelTypeSet migrate_types;
     migrate_types.insert(syncable::PREFERENCES);
     TriggerMigrationDoneError(migrate_types);
   }
 
   // Phase 2: Modify a bookmark (to trigger migration) and wait for a
   // sync cycle.
   // TODO(akalin): Shouldn't need to wait for full sync cycle; see
   // 93167.
   ASSERT_TRUE(AddURL(0, IndexedURLTitle(0), GURL(IndexedURL(0))) != NULL);
   ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion("Migration"));

[akalin, 2011/08/19 01:34:28]

Here, too

 }
 
 // TODO(akalin): Add tests where the migration trigger is a poll or a
 // nudge from notifications.
 
 class MigrationErrorsTest : public LiveSyncTest {
  public:
   MigrationErrorsTest() : LiveSyncTest(TWO_CLIENT) {}
   virtual ~MigrationErrorsTest() {}
 
@@ skipping 142 matching lines @@
   // Phase 3: Modify a bookmark and wait for it to sync.
   ASSERT_TRUE(AddURL(0, IndexedURLTitle(0), GURL(IndexedURL(0))) != NULL);
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
 
   // Phase 4: Verify that preferences can still be synchronized.
   ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
   ChangeBooleanPref(0, prefs::kShowHomeButton);
   ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
   ASSERT_TRUE(BooleanPrefMatches(prefs::kShowHomeButton));
 }