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

Unified Diff: chrome/browser/sync/test/integration/migration_errors_test.cc

Issue 9185031: Avoid SYNC_CYCLE_CONTINUATION sync cycles (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix typo Created 8 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/sync/test/integration/enable_disable_test.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/test/integration/migration_errors_test.cc
diff --git a/chrome/browser/sync/test/integration/migration_errors_test.cc b/chrome/browser/sync/test/integration/migration_errors_test.cc
index d605e80cc1dc87fa0cbd394fa2fa87529054838d..97e76b9e4adcc7b11b357b864d1e6d591fbe45f4 100644
--- a/chrome/browser/sync/test/integration/migration_errors_test.cc
+++ b/chrome/browser/sync/test/integration/migration_errors_test.cc
@@ -171,7 +171,16 @@ class MigrationTest : public SyncTest {
}
// Phase 3: Wait for all clients to catch up.
- ASSERT_TRUE(AwaitQuiescence());
+ //
+ // 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) {
« no previous file with comments | « chrome/browser/sync/test/integration/enable_disable_test.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698