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

Unified Diff: chrome/test/live_sync/live_sync_test.cc

Issue 3160002: Error reporting for sync setup failure. (Closed)
Patch Set: Created 10 years, 4 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/test/live_sync/profile_sync_service_test_harness.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/live_sync/live_sync_test.cc
diff --git a/chrome/test/live_sync/live_sync_test.cc b/chrome/test/live_sync/live_sync_test.cc
index a43ac60cfeabc459d562b288e4785641b4b833b6..024f6ef9c6e8f9fdfd64ceb7556ff279ceefccfd 100644
--- a/chrome/test/live_sync/live_sync_test.cc
+++ b/chrome/test/live_sync/live_sync_test.cc
@@ -130,12 +130,10 @@ bool LiveSyncTest::SetupClients() {
for (int i = 0; i < num_clients_; ++i) {
profiles_.push_back(MakeProfile(
StringPrintf(FILE_PATH_LITERAL("Profile%d"), i)));
- if (GetProfile(i) == NULL)
- return false;
+ EXPECT_FALSE(GetProfile(i) == NULL) << "GetProfile(" << i << ") failed.";
clients_.push_back(new ProfileSyncServiceTestHarness(
GetProfile(i), username_, password_));
- if (GetClient(i) == NULL)
- return false;
+ EXPECT_FALSE(GetClient(i) == NULL) << "GetClient(" << i << ") failed.";
}
// Create the verifier profile.
@@ -146,15 +144,14 @@ bool LiveSyncTest::SetupClients() {
bool LiveSyncTest::SetupSync() {
// Create sync profiles and clients if they haven't already been created.
if (profiles_.empty()) {
- if (!SetupClients())
- return false;
+ EXPECT_TRUE(SetupClients()) << "SetupClients() failed.";
}
// Sync each of the profiles.
for (int i = 0; i < num_clients_; ++i) {
- if (!GetClient(i)->SetupSync())
- return false;
+ EXPECT_TRUE(GetClient(i)->SetupSync()) << "SetupSync() failed.";
}
+
return true;
}
« no previous file with comments | « no previous file | chrome/test/live_sync/profile_sync_service_test_harness.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698