Improve error triggering in sync_integration_tests

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

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..44b56fd4a723dadcf87a46398156f6a596dcbdf2 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);
+  EXPECT_TRUE(GetFakeServer()->TriggerError(sync_pb::SyncEnums::USER_ROLLBACK));

[Nicolas Zea, 2014/10/10 23:51:09]

nit: should these all be ASSERT_TRUE? If this fails, does it make sense to
continue the test?

[pval...(no longer on Chromium), 2014/10/14 17:26:03]

You're right. I was thinking we may want to see what happens afterwards, but
this error should immediately stop the test. It doesn't make sense to continue.

 
   // 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);
+  EXPECT_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);
+  EXPECT_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);
+  EXPECT_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);
+  EXPECT_TRUE(GetFakeServer()->TriggerError(sync_pb::SyncEnums::USER_ROLLBACK));
 
   // Make another change to trigger downloading of rollback command.
   Remove(0, sub_folder, 0);