diff options
Diffstat (limited to 'chrome/test/live_sync')
4 files changed, 33 insertions, 36 deletions
diff --git a/chrome/test/live_sync/live_autofill_sync_test.h b/chrome/test/live_sync/live_autofill_sync_test.h index f591488..32cb2d3 100644 --- a/chrome/test/live_sync/live_autofill_sync_test.h +++ b/chrome/test/live_sync/live_autofill_sync_test.h @@ -271,20 +271,20 @@ class LiveAutofillSyncTest : public LiveSyncTest { for (size_t i = 0; i < profiles.size(); ++i) { const AutoFillProfile* p = profiles[i]; if (!expected_profiles_map.count(p->Label())) { - LOG(INFO) << "Label " << p->Label() << " not in expected"; + VLOG(1) << "Label " << p->Label() << " not in expected"; return false; } AutoFillProfile* expected_profile = &expected_profiles_map[p->Label()]; expected_profile->set_unique_id(p->unique_id()); if (*expected_profile != *p) { - LOG(INFO) << "Profile mismatch"; + VLOG(1) << "Profile mismatch"; return false; } expected_profiles_map.erase(p->Label()); } if (expected_profiles_map.size()) { - LOG(INFO) << "Labels in expected but not supplied"; + VLOG(1) << "Labels in expected but not supplied"; return false; } diff --git a/chrome/test/live_sync/live_sync_test.cc b/chrome/test/live_sync/live_sync_test.cc index 6fd16cb..eca363e 100644 --- a/chrome/test/live_sync/live_sync_test.cc +++ b/chrome/test/live_sync/live_sync_test.cc @@ -281,8 +281,8 @@ void LiveSyncTest::SetUpTestServerIfRequired() { LOG(FATAL) << "Failed to set up local python test server"; } else if (!cl->HasSwitch(switches::kSyncServiceURL) && cl->HasSwitch(switches::kSyncServerCommandLine)) { - LOG(FATAL) - << "Sync server command line must be accompanied by sync service URL."; + LOG(FATAL) << "Sync server command line must be accompanied by sync " + "service URL."; } } @@ -295,7 +295,7 @@ bool LiveSyncTest::SetUpLocalPythonTestServer() { test_server()->host_port_pair().host().c_str(), test_server()->host_port_pair().port()); cl->AppendSwitchASCII(switches::kSyncServiceURL, sync_service_url); - LOG(INFO) << "Started local python test server at " << sync_service_url; + VLOG(1) << "Started local python test server at " << sync_service_url; // TODO(akalin): Set the kSyncNotificationHost switch here once a local python // notification server is implemented. @@ -321,8 +321,8 @@ bool LiveSyncTest::SetUpLocalTestServer() { const int kMaxWaitTime = TestTimeouts::live_operation_timeout_ms(); const int kNumIntervals = 15; if (WaitForTestServerToStart(kMaxWaitTime, kNumIntervals)) { - LOG(INFO) << "Started local test server at " - << cl->GetSwitchValueASCII(switches::kSyncServiceURL) << "."; + VLOG(1) << "Started local test server at " + << cl->GetSwitchValueASCII(switches::kSyncServiceURL) << "."; return true; } else { LOG(ERROR) << "Could not start local test server at " diff --git a/chrome/test/live_sync/profile_sync_service_test_harness.cc b/chrome/test/live_sync/profile_sync_service_test_harness.cc index 5d037f6..a903fa7 100644 --- a/chrome/test/live_sync/profile_sync_service_test_harness.cc +++ b/chrome/test/live_sync/profile_sync_service_test_harness.cc @@ -322,7 +322,7 @@ bool ProfileSyncServiceTestHarness::AwaitGroupSyncCycleCompletion( // static bool ProfileSyncServiceTestHarness::AwaitQuiescence( std::vector<ProfileSyncServiceTestHarness*>& clients) { - LOG(INFO) << "AwaitQuiescence."; + VLOG(1) << "AwaitQuiescence."; bool return_value = true; for (std::vector<ProfileSyncServiceTestHarness*>::iterator it = clients.begin(); it != clients.end(); ++it) { @@ -419,13 +419,11 @@ void ProfileSyncServiceTestHarness::EnableSyncForDatatype( service()->OnUserChoseDatatypes(false, synced_datatypes); wait_state_ = WAITING_FOR_SYNC_TO_FINISH; AwaitSyncCycleCompletion("Waiting for datatype configuration."); - LOG(INFO) << "EnableSyncForDatatype(): Enabled sync for datatype " - << syncable::ModelTypeToString(datatype) - << " on Client " << id_ << "."; + VLOG(1) << "EnableSyncForDatatype(): Enabled sync for datatype " + << syncable::ModelTypeToString(datatype) << " on Client " << id_; } else { - LOG(INFO) << "EnableSyncForDatatype(): Sync already enabled for datatype " - << syncable::ModelTypeToString(datatype) - << " on Client " << id_ << "."; + VLOG(1) << "EnableSyncForDatatype(): Sync already enabled for datatype " + << syncable::ModelTypeToString(datatype) << " on Client " << id_; } } } @@ -442,13 +440,11 @@ void ProfileSyncServiceTestHarness::DisableSyncForDatatype( synced_datatypes.erase(it); service()->OnUserChoseDatatypes(false, synced_datatypes); AwaitSyncCycleCompletion("Waiting for datatype configuration."); - LOG(INFO) << "DisableSyncForDatatype(): Disabled sync for datatype " - << syncable::ModelTypeToString(datatype) - << " on Client " << id_ << "."; + VLOG(1) << "DisableSyncForDatatype(): Disabled sync for datatype " + << syncable::ModelTypeToString(datatype) << " on Client " << id_; } else { - LOG(INFO) << "DisableSyncForDatatype(): Sync already disabled for datatype " - << syncable::ModelTypeToString(datatype) - << " on Client " << id_ << "."; + VLOG(1) << "DisableSyncForDatatype(): Sync already disabled for datatype " + << syncable::ModelTypeToString(datatype) << " on Client " << id_; } } @@ -469,8 +465,8 @@ void ProfileSyncServiceTestHarness::EnableSyncForAllDatatypes() { service()->OnUserChoseDatatypes(true, synced_datatypes); wait_state_ = WAITING_FOR_SYNC_TO_FINISH; AwaitSyncCycleCompletion("Waiting for datatype configuration."); - LOG(INFO) << "EnableSyncForAllDatatypes(): Enabled sync for all datatypes" - << " on Client " << id_ << "."; + VLOG(1) << "EnableSyncForAllDatatypes(): Enabled sync for all datatypes on " + "Client " << id_; } } @@ -480,8 +476,8 @@ void ProfileSyncServiceTestHarness::DisableSyncForAllDatatypes() { << "EnableSyncForAllDatatypes(): service() is null."; service()->DisableForUser(); wait_state_ = SYNC_DISABLED; - LOG(INFO) << "DisableSyncForAllDatatypes(): Disabled sync for all datatypes" - << " on Client " << id_ << "."; + VLOG(1) << "DisableSyncForAllDatatypes(): Disabled sync for all datatypes on " + "Client " << id_; } int64 ProfileSyncServiceTestHarness::GetUpdatedTimestamp() { @@ -495,16 +491,17 @@ int64 ProfileSyncServiceTestHarness::GetUpdatedTimestamp() { void ProfileSyncServiceTestHarness::LogClientInfo(std::string message) { const SyncSessionSnapshot* snap = GetLastSessionSnapshot(); if (snap) { - LOG(INFO) << "Client " << id_ << ": " << message << ": " - << "max_local_timestamp: " << snap->max_local_timestamp - << ", has_more_to_sync: " << snap->has_more_to_sync - << ", unsynced_count: " << snap->unsynced_count - << ", has_unsynced_items: " << service()->backend()->HasUnsyncedItems() - << ", notifications_enabled: " << GetStatus().notifications_enabled - << ", service_is_pushing_changes: " << ServiceIsPushingChanges() - << "."; + VLOG(1) << "Client " << id_ << ": " << message + << ": max_local_timestamp: " << snap->max_local_timestamp + << ", has_more_to_sync: " << snap->has_more_to_sync + << ", unsynced_count: " << snap->unsynced_count + << ", has_unsynced_items: " + << service()->backend()->HasUnsyncedItems() + << ", notifications_enabled: " + << GetStatus().notifications_enabled + << ", service_is_pushing_changes: " << ServiceIsPushingChanges(); } else { - LOG(INFO) << "Client " << id_ << ": " << message << ": " - << "Sync session snapshot not available."; + VLOG(1) << "Client " << id_ << ": " << message + << ": Sync session snapshot not available."; } } diff --git a/chrome/test/live_sync/two_client_live_bookmarks_sync_test.cc b/chrome/test/live_sync/two_client_live_bookmarks_sync_test.cc index e857d25..8f337a2 100644 --- a/chrome/test/live_sync/two_client_live_bookmarks_sync_test.cc +++ b/chrome/test/live_sync/two_client_live_bookmarks_sync_test.cc @@ -338,7 +338,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest, } } } - LOG(INFO) << "Adding several bookmarks under other bookmarks"; + VLOG(1) << "Adding several bookmarks under other bookmarks"; for (int index = 0; index < 10; index++) { wstring title(L"Other - TestBookmark"); title.append(IntToWStringHack(index)); |