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

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

Issue 650463003: Improve error triggering in sync_integration_tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 | « no previous file | chrome/browser/sync/test/integration/sync_errors_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/test/integration/single_client_backup_rollback_test.cc
diff --git a/chrome/browser/sync/test/integration/single_client_backup_rollback_test.cc b/chrome/browser/sync/test/integration/single_client_backup_rollback_test.cc
index 874e3f12e232afdb5336938d62eb3044580f2c61..b819a80eafb24cefccb61fbdb2b652d8dc688874 100644
--- a/chrome/browser/sync/test/integration/single_client_backup_rollback_test.cc
+++ b/chrome/browser/sync/test/integration/single_client_backup_rollback_test.cc
@@ -233,7 +233,7 @@ IN_PROC_BROWSER_TEST_F(SingleClientBackupRollbackTest,
ASSERT_TRUE(ModelMatchesVerifier(0));
// Let server to return rollback command on next sync request.
- GetFakeServer()->TriggerError(sync_pb::SyncEnums::USER_ROLLBACK);
+ ASSERT_TRUE(GetFakeServer()->TriggerError(sync_pb::SyncEnums::USER_ROLLBACK));
// Make another change to trigger downloading of rollback command.
Remove(0, tier1_b, 0);
@@ -287,7 +287,7 @@ IN_PROC_BROWSER_TEST_F(SingleClientBackupRollbackTest,
ASSERT_TRUE(ModelMatchesVerifier(0));
// Let server to return rollback command on next sync request.
- GetFakeServer()->TriggerError(sync_pb::SyncEnums::USER_ROLLBACK);
+ ASSERT_TRUE(GetFakeServer()->TriggerError(sync_pb::SyncEnums::USER_ROLLBACK));
// Make another change to trigger downloading of rollback command.
Remove(0, GetOtherNode(0), 0);
@@ -334,7 +334,8 @@ IN_PROC_BROWSER_TEST_F(SingleClientBackupRollbackTest,
ASSERT_TRUE(ModelMatchesVerifier(0));
// Let server to return birthday error on next sync request.
- GetFakeServer()->TriggerError(sync_pb::SyncEnums::NOT_MY_BIRTHDAY);
+ ASSERT_TRUE(GetFakeServer()->TriggerError(
+ sync_pb::SyncEnums::NOT_MY_BIRTHDAY));
// Make another change to trigger downloading of rollback command.
Remove(0, GetOtherNode(0), 0);
@@ -379,7 +380,7 @@ IN_PROC_BROWSER_TEST_F(SingleClientBackupRollbackTest,
true);
// Let server to return rollback command on next sync request.
- GetFakeServer()->TriggerError(sync_pb::SyncEnums::USER_ROLLBACK);
+ ASSERT_TRUE(GetFakeServer()->TriggerError(sync_pb::SyncEnums::USER_ROLLBACK));
// Make another change to trigger downloading of rollback command.
Remove(0, GetOtherNode(0), 0);
@@ -422,7 +423,7 @@ IN_PROC_BROWSER_TEST_F(SingleClientBackupRollbackTest,
ASSERT_TRUE(ModelMatchesVerifier(0));
// Let server to return rollback command on next sync request.
- GetFakeServer()->TriggerError(sync_pb::SyncEnums::USER_ROLLBACK);
+ ASSERT_TRUE(GetFakeServer()->TriggerError(sync_pb::SyncEnums::USER_ROLLBACK));
// Make another change to trigger downloading of rollback command.
Remove(0, sub_folder, 0);
« no previous file with comments | « no previous file | chrome/browser/sync/test/integration/sync_errors_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698