Improve error triggering in sync_integration_tests

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

 // Copyright 2014 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 "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/run_loop.h"
 #include "base/test/test_timeouts.h"
@@ skipping 215 matching lines @@
   ASSERT_TRUE(ModelMatchesVerifier(0));
 
   // Made bookmark changes while sync is on.
   Move(0, tier1_a->GetChild(0), tier1_b, 1);
   Remove(0, tier1_b, 0);
   ASSERT_TRUE(AddFolder(0, tier1_b, 1, "tier2_c"));
   ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService(0)));
   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);
 
   // Wait for rollback to finish and sync backend is completely shut down.
   SyncRollbackChecker rollback_checker(GetSyncService(0));
   ASSERT_TRUE(rollback_checker.Wait());
   SyncBackendStoppedChecker shutdown_checker(GetSyncService(0));
   ASSERT_TRUE(shutdown_checker.Wait());
 
@@ skipping 33 matching lines @@
   ASSERT_TRUE(ModelMatchesVerifier(0));
 
   // Made bookmark changes while sync is on.
   Remove(0, GetOtherNode(0), 1);
   ASSERT_TRUE(AddURL(0, GetOtherNode(0), 1, "url2",
                      GURL("http://www.yahoo.com")));
   ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0))));
   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);
 
   // Wait for sync backend is completely shut down.
   SyncBackendStoppedChecker shutdown_checker(GetSyncService(0));
   ASSERT_TRUE(shutdown_checker.Wait());
 
   // With rollback disabled, bookmarks in backup DB should not be restored.
   // Only bookmark added during sync is present.
@@ skipping 26 matching lines @@
   ASSERT_TRUE(ModelMatchesVerifier(0));
 
   // Made bookmark changes while sync is on.
   Remove(0, GetOtherNode(0), 1);
   ASSERT_TRUE(AddURL(0, GetOtherNode(0), 1, "url2",
                      GURL("http://www.yahoo.com")));
   ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0))));
   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);
 
   // Wait sync backend is completely shut down.
   SyncBackendStoppedChecker shutdown_checker(GetSyncService(0));
   ASSERT_TRUE(shutdown_checker.Wait());
 
   // Shouldn't restore bookmarks with sign-out only.
   ASSERT_EQ(1, GetOtherNode(0)->child_count());
@@ skipping 24 matching lines @@
 
   ASSERT_TRUE(AddURL(0, GetOtherNode(0), 1, "url1",
                      GURL("http://www.nhl.com")));
 
   // Delete backup DB.
   base::DeleteFile(
       GetProfile(0)->GetPath().Append(FILE_PATH_LITERAL("Sync Data Backup")),
       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);
 
   // Wait for rollback to finish and sync backend is completely shut down.
   SyncRollbackChecker rollback_checker(GetSyncService(0));
   ASSERT_TRUE(rollback_checker.Wait());
   SyncBackendStoppedChecker checker(GetSyncService(0));
   ASSERT_TRUE(checker.Wait());
 
@@ skipping 22 matching lines @@
   ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService(0)));
   ASSERT_TRUE(ModelMatchesVerifier(0));
 
   // Made bookmark changes while sync is on.
   Remove(0, sub_folder, 0);
   Remove(0, sub_folder, 0);
   ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService(0)));
   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);
 
   // Wait for rollback to finish and sync backend is completely shut down.
   SyncRollbackChecker rollback_checker(GetSyncService(0));
   ASSERT_TRUE(rollback_checker.Wait());
   SyncBackendStoppedChecker shutdown_checker(GetSyncService(0));
   ASSERT_TRUE(shutdown_checker.Wait());
 
   // Verify bookmarks are unchanged.
   ASSERT_EQ(3, sub_folder->child_count());
   ASSERT_EQ(GURL(kUrl1), sub_folder->GetChild(0)->url());
   ASSERT_EQ(GURL(kUrl2), sub_folder->GetChild(1)->url());
   ASSERT_EQ(GURL(kUrl3), sub_folder->GetChild(2)->url());
 }