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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: sync/engine/syncer_unittest.cc

Issue 1132013004: [Sync] Refactoring polling to be reliable. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Full patch Created 5 years, 7 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 | « sync/engine/syncer.cc ('k') | sync/internal_api/js_sync_manager_observer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/engine/syncer_unittest.cc
diff --git a/sync/engine/syncer_unittest.cc b/sync/engine/syncer_unittest.cc
index 3257c4bbef70f849f5012c644bb2f51ae0ab0031..a3375e32a7c2f540f03afe8284f564be8afb4c49 100644
--- a/sync/engine/syncer_unittest.cc
+++ b/sync/engine/syncer_unittest.cc
@@ -256,22 +256,22 @@ class SyncerTest : public testing::Test,
session_.reset(SyncSession::Build(context_.get(), this));
}
- void SyncShareNudge() {
+ bool SyncShareNudge() {
ResetSession();
// Pretend we've seen a local change, to make the nudge_tracker look normal.
nudge_tracker_.RecordLocalChange(ModelTypeSet(BOOKMARKS));
- EXPECT_TRUE(syncer_->NormalSyncShare(context_->GetEnabledTypes(),
- &nudge_tracker_, session_.get()));
+ return syncer_->NormalSyncShare(context_->GetEnabledTypes(),
+ &nudge_tracker_, session_.get());
}
- void SyncShareConfigure() {
+ bool SyncShareConfigure() {
ResetSession();
- EXPECT_TRUE(syncer_->ConfigureSyncShare(
+ return syncer_->ConfigureSyncShare(
context_->GetEnabledTypes(),
sync_pb::GetUpdatesCallerInfo::RECONFIGURATION,
- session_.get()));
+ session_.get());
}
void SetUp() override {
@@ -469,7 +469,7 @@ class SyncerTest : public testing::Test,
test++;
}
}
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
ASSERT_TRUE(expected_positions.size() ==
mock_server_->committed_ids().size());
// If this test starts failing, be aware other sort orders could be valid.
@@ -628,7 +628,7 @@ TEST_F(SyncerTest, GetCommitIdsFiltersThrottledEntries) {
mock_server_->AddUpdateDirectory(1, 0, "A", 10, 10,
foreign_cache_guid(), "-1");
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
{
WriteTransaction wtrans(FROM_HERE, UNITTEST, directory());
@@ -657,7 +657,7 @@ TEST_F(SyncerTest, GetCommitIdsFiltersThrottledEntries) {
// Sync again with bookmarks enabled.
mock_server_->ExpectGetUpdatesRequestTypes(context_->GetEnabledTypes());
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
{
// It should have been committed.
syncable::ReadTransaction rtrans(FROM_HERE, directory());
@@ -701,7 +701,7 @@ TEST_F(SyncerTest, GetCommitIdsFiltersUnreadyEntries) {
foreign_cache_guid(), "-3");
mock_server_->AddUpdateDirectory(4, 0, "D", 10, 10,
foreign_cache_guid(), "-4");
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
// Server side change will put A in conflict.
mock_server_->AddUpdateDirectory(1, 0, "A", 20, 20,
foreign_cache_guid(), "-1");
@@ -745,7 +745,7 @@ TEST_F(SyncerTest, GetCommitIdsFiltersUnreadyEntries) {
D.PutSpecifics(encrypted_bookmark);
D.PutNonUniqueName("not encrypted");
}
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
{
// Nothing should have commited due to bookmarks being encrypted and
// the cryptographer having pending keys. A would have been resolved
@@ -759,7 +759,7 @@ TEST_F(SyncerTest, GetCommitIdsFiltersUnreadyEntries) {
// Resolve the pending keys.
GetCryptographer(&rtrans)->DecryptPendingKeys(other_params);
}
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
{
// All properly encrypted and non-conflicting items should commit. "A" was
// conflicting, but last sync cycle resolved it as simple conflict, so on
@@ -786,7 +786,7 @@ TEST_F(SyncerTest, GetCommitIdsFiltersUnreadyEntries) {
D.PutSpecifics(encrypted_bookmark);
D.PutNonUniqueName(kEncryptedString);
}
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
{
const StatusController& status_controller = session_->status_controller();
// Expect success.
@@ -816,7 +816,7 @@ TEST_F(SyncerTest, GetUpdatesPartialThrottled) {
foreign_cache_guid(), "-3");
mock_server_->AddUpdateSpecifics(4, 0, "D", 10, 10, false, 0, pref);
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
{
// Initial state. Everything is normal.
syncable::ReadTransaction rtrans(FROM_HERE, directory());
@@ -850,7 +850,7 @@ TEST_F(SyncerTest, GetUpdatesPartialThrottled) {
C.PutIsUnsynced(true);
D.PutIsUnsynced(true);
}
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
{
// BOOKMARKS throttled.
syncable::ReadTransaction rtrans(FROM_HERE, directory());
@@ -870,7 +870,7 @@ TEST_F(SyncerTest, GetUpdatesPartialThrottled) {
mock_server_->AddUpdateSpecifics(3, 1, "G", 30, 30, false, 1, bookmark,
foreign_cache_guid(), "-3");
mock_server_->AddUpdateSpecifics(4, 0, "H", 30, 30, false, 0, pref);
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
{
// BOOKMARKS unthrottled.
syncable::ReadTransaction rtrans(FROM_HERE, directory());
@@ -1025,7 +1025,7 @@ TEST_F(SyncerTest, EncryptionAwareConflicts) {
mock_server_->AddUpdateSpecifics(3, 1, "C", 10, 10, false, 1, bookmark,
foreign_cache_guid(), "-3");
mock_server_->AddUpdateSpecifics(4, 0, "D", 10, 10, false, 0, pref);
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
{
// Initial state. Everything is normal.
syncable::ReadTransaction rtrans(FROM_HERE, directory());
@@ -1058,7 +1058,7 @@ TEST_F(SyncerTest, EncryptionAwareConflicts) {
mock_server_->AddUpdateSpecifics(4, 0, kEncryptedString, 20, 20, false, 0,
encrypted_pref,
foreign_cache_guid(), "-4");
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
{
// All should be unapplied due to being undecryptable and have a valid
// BASE_SERVER_SPECIFICS.
@@ -1081,7 +1081,7 @@ TEST_F(SyncerTest, EncryptionAwareConflicts) {
mock_server_->AddUpdateSpecifics(4, 0, kEncryptedString, 30, 30, false, 0,
encrypted_pref,
foreign_cache_guid(), "-4");
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
{
// Items 1, 2, and 4 should have newer server versions, 3 remains the same.
// All should remain unapplied due to be undecryptable.
@@ -1101,7 +1101,7 @@ TEST_F(SyncerTest, EncryptionAwareConflicts) {
mock_server_->AddUpdateSpecifics(3, 1, kEncryptedString, 30, 30, false, 3,
encrypted_bookmark,
foreign_cache_guid(), "-3");
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
{
// Items 2 and 4 should be the only ones with BASE_SERVER_SPECIFICS set.
// Items 1 is now unencrypted, so should have applied normally.
@@ -1136,7 +1136,7 @@ TEST_F(SyncerTest, EncryptionAwareConflicts) {
D.PutNonUniqueName(kEncryptedString);
D.PutIsUnsynced(true);
}
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
{
// Item 1 remains unsynced due to there being pending keys.
// Items 2, 3, 4 should remain unsynced since they were not up to date.
@@ -1153,7 +1153,7 @@ TEST_F(SyncerTest, EncryptionAwareConflicts) {
GetCryptographer(&rtrans)->DecryptPendingKeys(key_params);
}
// First cycle resolves conflicts, second cycle commits changes.
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
EXPECT_EQ(1, GetUpdateCounters(BOOKMARKS).num_server_overwrites);
EXPECT_EQ(1, GetUpdateCounters(PREFERENCES).num_server_overwrites);
EXPECT_EQ(1, GetUpdateCounters(BOOKMARKS).num_local_overwrites);
@@ -1164,7 +1164,7 @@ TEST_F(SyncerTest, EncryptionAwareConflicts) {
EXPECT_EQ(1, GetCommitCounters(PREFERENCES).num_commits_attempted);
EXPECT_EQ(1, GetCommitCounters(PREFERENCES).num_commits_success);
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
// Everything should be resolved now. The local changes should have
// overwritten the server changes for 2 and 4, while the server changes
@@ -1203,7 +1203,7 @@ TEST_F(SyncerTest, TestGetUnsyncedAndSimpleCommit) {
WriteTestDataToEntry(&wtrans, &child);
}
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
ASSERT_EQ(2u, mock_server_->committed_ids().size());
// If this test starts failing, be aware other sort orders could be valid.
EXPECT_TRUE(parent_id_ == mock_server_->committed_ids()[0]);
@@ -1251,7 +1251,7 @@ TEST_F(SyncerTest, TestPurgeWhileUnsynced) {
ModelTypeSet(),
ModelTypeSet());
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
ASSERT_EQ(2U, mock_server_->committed_ids().size());
// If this test starts failing, be aware other sort orders could be valid.
EXPECT_TRUE(parent_id_ == mock_server_->committed_ids()[0]);
@@ -1289,7 +1289,7 @@ TEST_F(SyncerTest, TestPurgeWhileUnapplied) {
ModelTypeSet(),
ModelTypeSet());
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
directory()->SaveChanges();
{
syncable::ReadTransaction rt(FROM_HERE, directory());
@@ -1348,7 +1348,7 @@ TEST_F(SyncerTest, ResetVersions) {
mock_server_->AddUpdatePref("id1", "", "tag1", 20, 20);
mock_server_->AddUpdatePref("id2", "", "tag2", 30, 30);
mock_server_->AddUpdatePref("id3", "", "tag3", 40, 40);
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
{
// Modify one of the preferences locally, mark another one as unapplied,
@@ -1603,7 +1603,7 @@ TEST_F(SyncerTest, TestCommitListOrderingWithNesting) {
}
}
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
ASSERT_EQ(6u, mock_server_->committed_ids().size());
// This test will NOT unroll deletes because SERVER_PARENT_ID is not set.
// It will treat these like moves.
@@ -1673,7 +1673,7 @@ TEST_F(SyncerTest, TestCommitListOrderingWithNewItems) {
child.PutBaseVersion(1);
}
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
ASSERT_EQ(6u, mock_server_->committed_ids().size());
// This strange iteration and std::count() usage is to allow the order to
@@ -1727,7 +1727,7 @@ TEST_F(SyncerTest, TestCommitListOrderingCounterexample) {
child2.PutBaseVersion(1);
}
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
ASSERT_EQ(3u, mock_server_->committed_ids().size());
EXPECT_TRUE(parent_id_ == mock_server_->committed_ids()[0]);
// There are two possible valid orderings.
@@ -1779,7 +1779,7 @@ TEST_F(SyncerTest, TestCommitListOrderingAndNewParent) {
child.PutBaseVersion(1);
}
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
ASSERT_EQ(3u, mock_server_->committed_ids().size());
// If this test starts failing, be aware other sort orders could be valid.
EXPECT_TRUE(parent_id_ == mock_server_->committed_ids()[0]);
@@ -1850,7 +1850,7 @@ TEST_F(SyncerTest, TestCommitListOrderingAndNewParentAndChild) {
meta_handle_b = child.GetMetahandle();
}
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
ASSERT_EQ(3u, mock_server_->committed_ids().size());
// If this test starts failing, be aware other sort orders could be valid.
EXPECT_TRUE(parent_id_ == mock_server_->committed_ids()[0]);
@@ -1888,12 +1888,12 @@ TEST_F(SyncerTest, UpdateWithZeroLengthName) {
// And one legal one that we're going to delete.
mock_server_->AddUpdateDirectory(2, 0, "FOO", 1, 10,
foreign_cache_guid(), "-2");
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
// Delete the legal one. The new update has a null name.
mock_server_->AddUpdateDirectory(
2, 0, std::string(), 2, 20, foreign_cache_guid(), "-2");
mock_server_->SetLastUpdateDeleted();
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
}
TEST_F(SyncerTest, TestBasicUpdate) {
@@ -1905,7 +1905,7 @@ TEST_F(SyncerTest, TestBasicUpdate) {
mock_server_->AddUpdateDirectory(id, parent_id, name, version, timestamp,
foreign_cache_guid(), "-1");
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
{
WriteTransaction trans(FROM_HERE, UNITTEST, directory());
Entry entry(&trans, GET_BY_ID,
@@ -1939,7 +1939,7 @@ TEST_F(SyncerTest, IllegalAndLegalUpdates) {
mock_server_->AddUpdateDirectory(3, -80, "bad_parent", 10, 10,
foreign_cache_guid(), "-3");
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
// Id 3 should be in conflict now.
EXPECT_EQ(
@@ -1965,7 +1965,7 @@ TEST_F(SyncerTest, IllegalAndLegalUpdates) {
mock_server_->AddUpdateDirectory(10, 0, "dir_to_bookmark", 10, 10,
foreign_cache_guid(), "-10");
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
// The three items with an unresolved parent should be unapplied (3, 9, 100).
// The name clash should also still be in conflict.
EXPECT_EQ(
@@ -2011,12 +2011,12 @@ TEST_F(SyncerTest, IllegalAndLegalUpdates) {
// Flip the is_dir bit: should fail verify & be dropped.
mock_server_->AddUpdateBookmark(10, 0, "dir_to_bookmark", 20, 20,
foreign_cache_guid(), "-10");
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
// Version number older than last known: should fail verify & be dropped.
mock_server_->AddUpdateDirectory(4, 0, "old_version", 10, 10,
foreign_cache_guid(), "-4");
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
{
syncable::ReadTransaction trans(FROM_HERE, directory());
@@ -2137,7 +2137,7 @@ TEST_F(SyncerTest, CommitReuniteUpdateAdjustsChildren) {
mock_server_->set_conflict_all_commits(true);
// Alright! Apply that update!
- SyncShareNudge();
+ EXPECT_FALSE(SyncShareNudge());
{
// The folder's ID should have been updated.
syncable::ReadTransaction trans(FROM_HERE, directory());
@@ -2202,7 +2202,7 @@ TEST_F(SyncerTest, CommitReuniteUpdate) {
mock_server_->set_conflict_all_commits(true);
// Alright! Apply that update!
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
{
syncable::ReadTransaction trans(FROM_HERE, directory());
Entry entry(&trans, GET_BY_HANDLE, entry_metahandle);
@@ -2263,7 +2263,7 @@ TEST_F(SyncerTest, CommitReuniteUpdateDoesNotChokeOnDeletedLocalEntry) {
}
// Just don't CHECK fail in sync, have the update split.
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
{
syncable::ReadTransaction trans(FROM_HERE, directory());
Id new_entry_id = GetOnlyEntryWithName(
@@ -2285,7 +2285,7 @@ TEST_F(SyncerTest, ConflictMatchingEntryHandlesUnsanitizedNames) {
mock_server_->AddUpdateDirectory(2, 0, "B/B", 10, 10,
foreign_cache_guid(), "-2");
mock_server_->set_conflict_all_commits(true);
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
{
WriteTransaction wtrans(FROM_HERE, UNITTEST, directory());
@@ -2300,7 +2300,7 @@ TEST_F(SyncerTest, ConflictMatchingEntryHandlesUnsanitizedNames) {
B.PutIsUnappliedUpdate(true);
B.PutServerVersion(20);
}
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
saw_syncer_event_ = false;
mock_server_->set_conflict_all_commits(false);
@@ -2327,7 +2327,7 @@ TEST_F(SyncerTest, ConflictMatchingEntryHandlesNormalNames) {
mock_server_->AddUpdateDirectory(2, 0, "B", 10, 10,
foreign_cache_guid(), "-2");
mock_server_->set_conflict_all_commits(true);
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
{
WriteTransaction wtrans(FROM_HERE, UNITTEST, directory());
@@ -2342,7 +2342,7 @@ TEST_F(SyncerTest, ConflictMatchingEntryHandlesNormalNames) {
B.PutIsUnappliedUpdate(true);
B.PutServerVersion(20);
}
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
saw_syncer_event_ = false;
mock_server_->set_conflict_all_commits(false);
@@ -2374,7 +2374,7 @@ TEST_F(SyncerTest, ReverseFolderOrderingTest) {
foreign_cache_guid(), "-2");
mock_server_->AddUpdateDirectory(1, 0, "parent", 10, 10,
foreign_cache_guid(), "-1");
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
syncable::ReadTransaction trans(FROM_HERE, directory());
Id child_id = GetOnlyEntryWithName(
@@ -2416,7 +2416,7 @@ TEST_F(EntryCreatedInNewFolderTest, EntryCreatedInNewFolderMidSync) {
mock_server_->SetMidCommitCallback(
base::Bind(&EntryCreatedInNewFolderTest::CreateFolderInBob,
base::Unretained(this)));
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
// We loop until no unsynced handles remain, so we will commit both ids.
EXPECT_EQ(2u, mock_server_->committed_ids().size());
{
@@ -2436,7 +2436,7 @@ TEST_F(EntryCreatedInNewFolderTest, EntryCreatedInNewFolderMidSync) {
TEST_F(SyncerTest, NegativeIDInUpdate) {
mock_server_->AddUpdateBookmark(-10, 0, "bad", 40, 40,
foreign_cache_guid(), "-100");
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
// The negative id would make us CHECK!
}
@@ -2454,7 +2454,7 @@ TEST_F(SyncerTest, UnappliedUpdateOnCreatedItemItemDoesNotCrash) {
WriteTestDataToEntry(&trans, &fred_match);
}
// Commit it.
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
EXPECT_EQ(1u, mock_server_->committed_ids().size());
mock_server_->set_conflict_all_commits(true);
syncable::Id fred_match_id;
@@ -2470,7 +2470,7 @@ TEST_F(SyncerTest, UnappliedUpdateOnCreatedItemItemDoesNotCrash) {
}
// Run the syncer.
for (int i = 0 ; i < 30 ; ++i) {
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
}
}
@@ -2500,7 +2500,7 @@ TEST_F(SyncerTest, DoublyChangedWithResolver) {
mock_server_->AddUpdateBookmark(child_id_, parent_id_, "Pete2.htm", 11, 10,
local_cache_guid(), local_id.GetServerId());
mock_server_->set_conflict_all_commits(true);
- SyncShareNudge();
+ EXPECT_FALSE(SyncShareNudge());
syncable::Directory::Metahandles children;
{
syncable::ReadTransaction trans(FROM_HERE, directory());
@@ -2538,7 +2538,7 @@ TEST_F(SyncerTest, CommitsUpdateDoesntAlterEntry) {
entry.PutMtime(test_time);
entry_metahandle = entry.GetMetahandle();
}
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
syncable::Id id;
int64 version;
{
@@ -2556,7 +2556,7 @@ TEST_F(SyncerTest, CommitsUpdateDoesntAlterEntry) {
EXPECT_EQ(id.GetServerId(), update->id_string());
EXPECT_EQ(root_id_.GetServerId(), update->parent_id_string());
EXPECT_EQ(version, update->version());
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
{
syncable::ReadTransaction trans(FROM_HERE, directory());
Entry entry(&trans, syncable::GET_BY_ID, id);
@@ -2604,9 +2604,9 @@ TEST_F(SyncerTest, ParentAndChildBothMatch) {
local_cache_guid(),
child_local_id.GetServerId());
mock_server_->set_conflict_all_commits(true);
- SyncShareNudge();
- SyncShareNudge();
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
+ EXPECT_TRUE(SyncShareNudge());
+ EXPECT_TRUE(SyncShareNudge());
{
syncable::ReadTransaction trans(FROM_HERE, directory());
Directory::Metahandles children;
@@ -2631,7 +2631,7 @@ TEST_F(SyncerTest, CommittingNewDeleted) {
entry.PutIsUnsynced(true);
entry.PutIsDel(true);
}
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
EXPECT_EQ(0u, mock_server_->committed_ids().size());
}
@@ -2659,7 +2659,7 @@ TEST_F(SyncerTest, UnappliedUpdateDuringCommit) {
entry.PutServerSpecifics(DefaultBookmarkSpecifics());
entry.PutIsDel(false);
}
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
EXPECT_EQ(1, session_->status_controller().TotalNumConflictingItems());
saw_syncer_event_ = false;
}
@@ -2686,7 +2686,7 @@ TEST_F(SyncerTest, DeletingEntryInFolder) {
entry.PutIsUnsynced(true);
existing_metahandle = entry.GetMetahandle();
}
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
{
WriteTransaction trans(FROM_HERE, UNITTEST, directory());
MutableEntry newfolder(&trans, CREATE, BOOKMARKS, trans.root_id(), "new");
@@ -2704,7 +2704,7 @@ TEST_F(SyncerTest, DeletingEntryInFolder) {
newfolder.PutIsDel(true);
existing.PutIsDel(true);
}
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
EXPECT_EQ(0, GetCommitCounters(BOOKMARKS).num_commits_conflict);
}
@@ -2713,7 +2713,7 @@ TEST_F(SyncerTest, DeletingEntryWithLocalEdits) {
mock_server_->AddUpdateDirectory(1, 0, "bob", 1, 10,
foreign_cache_guid(), "-1");
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
{
WriteTransaction trans(FROM_HERE, UNITTEST, directory());
MutableEntry newfolder(
@@ -2740,12 +2740,12 @@ TEST_F(SyncerTest, FolderSwapUpdate) {
foreign_cache_guid(), "-7801");
mock_server_->AddUpdateDirectory(1024, 0, "fred", 1, 10,
foreign_cache_guid(), "-1024");
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
mock_server_->AddUpdateDirectory(1024, 0, "bob", 2, 20,
foreign_cache_guid(), "-1024");
mock_server_->AddUpdateDirectory(7801, 0, "fred", 2, 20,
foreign_cache_guid(), "-7801");
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
{
syncable::ReadTransaction trans(FROM_HERE, directory());
Entry id1(&trans, GET_BY_ID, ids_.FromNumber(7801));
@@ -2767,7 +2767,7 @@ TEST_F(SyncerTest, NameCollidingFolderSwapWorksFine) {
foreign_cache_guid(), "-1024");
mock_server_->AddUpdateDirectory(4096, 0, "alice", 1, 10,
foreign_cache_guid(), "-4096");
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
{
syncable::ReadTransaction trans(FROM_HERE, directory());
Entry id1(&trans, GET_BY_ID, ids_.FromNumber(7801));
@@ -2789,7 +2789,7 @@ TEST_F(SyncerTest, NameCollidingFolderSwapWorksFine) {
foreign_cache_guid(), "-7801");
mock_server_->AddUpdateDirectory(4096, 0, "bob", 2, 20,
foreign_cache_guid(), "-4096");
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
{
syncable::ReadTransaction trans(FROM_HERE, directory());
Entry id1(&trans, GET_BY_ID, ids_.FromNumber(7801));
@@ -2827,7 +2827,7 @@ TEST_F(SyncerTest, CommitManyItemsInOneGo_Success) {
}
ASSERT_EQ(items_to_commit, directory()->unsynced_entity_count());
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
EXPECT_EQ(num_batches, mock_server_->commit_messages().size());
EXPECT_EQ(0, directory()->unsynced_entity_count());
}
@@ -2853,7 +2853,7 @@ TEST_F(SyncerTest, CommitManyItemsInOneGo_PostBufferFail) {
// The second commit should fail. It will be preceded by one successful
// GetUpdate and one succesful commit.
mock_server_->FailNthPostBufferToPathCall(3);
- SyncShareNudge();
+ EXPECT_FALSE(SyncShareNudge());
EXPECT_EQ(1U, mock_server_->commit_messages().size());
EXPECT_EQ(SYNC_SERVER_ERROR,
@@ -2882,7 +2882,7 @@ TEST_F(SyncerTest, CommitManyItemsInOneGo_CommitConflict) {
// Return a CONFLICT response for the first item.
mock_server_->set_conflict_n_commits(1);
- SyncShareNudge();
+ EXPECT_FALSE(SyncShareNudge());
// We should stop looping at the first sign of trouble.
EXPECT_EQ(1U, mock_server_->commit_messages().size());
@@ -2895,14 +2895,14 @@ TEST_F(SyncerTest, SendDebugInfoEventsOnGetUpdates_HappyCase) {
debug_info_getter_->AddDebugEvent();
debug_info_getter_->AddDebugEvent();
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
// Verify we received one GetUpdates request with two debug info events.
EXPECT_EQ(1U, mock_server_->requests().size());
ASSERT_TRUE(mock_server_->last_request().has_get_updates());
EXPECT_EQ(2, mock_server_->last_request().debug_info().events_size());
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
// See that we received another GetUpdates request, but that it contains no
// debug info events.
@@ -2912,7 +2912,7 @@ TEST_F(SyncerTest, SendDebugInfoEventsOnGetUpdates_HappyCase) {
debug_info_getter_->AddDebugEvent();
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
// See that we received another GetUpdates request and it contains one debug
// info event.
@@ -2927,7 +2927,7 @@ TEST_F(SyncerTest, SendDebugInfoEventsOnGetUpdates_PostFailsDontDrop) {
debug_info_getter_->AddDebugEvent();
mock_server_->FailNextPostBufferToPathCall();
- SyncShareNudge();
+ EXPECT_FALSE(SyncShareNudge());
// Verify we attempted to send one GetUpdates request with two debug info
// events.
@@ -2935,7 +2935,7 @@ TEST_F(SyncerTest, SendDebugInfoEventsOnGetUpdates_PostFailsDontDrop) {
ASSERT_TRUE(mock_server_->last_request().has_get_updates());
EXPECT_EQ(2, mock_server_->last_request().debug_info().events_size());
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
// See that the client resent the two debug info events.
EXPECT_EQ(2U, mock_server_->requests().size());
@@ -2944,25 +2944,25 @@ TEST_F(SyncerTest, SendDebugInfoEventsOnGetUpdates_PostFailsDontDrop) {
// The previous send was successful so this next one shouldn't generate any
// debug info events.
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
EXPECT_EQ(3U, mock_server_->requests().size());
ASSERT_TRUE(mock_server_->last_request().has_get_updates());
EXPECT_EQ(0, mock_server_->last_request().debug_info().events_size());
}
// Tests that commit failure with conflict will trigger GetUpdates for next
-// sycle of sync
+// cycle of sync
TEST_F(SyncerTest, CommitFailureWithConflict) {
ConfigureNoGetUpdatesRequired();
CreateUnsyncedDirectory("X", "id_X");
EXPECT_FALSE(nudge_tracker_.IsGetUpdatesRequired());
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
EXPECT_FALSE(nudge_tracker_.IsGetUpdatesRequired());
CreateUnsyncedDirectory("Y", "id_Y");
mock_server_->set_conflict_n_commits(1);
- SyncShareNudge();
+ EXPECT_FALSE(SyncShareNudge());
EXPECT_TRUE(nudge_tracker_.IsGetUpdatesRequired());
nudge_tracker_.RecordSuccessfulSyncCycle();
@@ -2978,7 +2978,7 @@ TEST_F(SyncerTest, SendDebugInfoEventsOnCommit_HappyCase) {
// Generate a debug info event and trigger a commit.
debug_info_getter_->AddDebugEvent();
CreateUnsyncedDirectory("X", "id_X");
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
// Verify that the last request received is a Commit and that it contains a
// debug info event.
@@ -2988,7 +2988,7 @@ TEST_F(SyncerTest, SendDebugInfoEventsOnCommit_HappyCase) {
// Generate another commit, but no debug info event.
CreateUnsyncedDirectory("Y", "id_Y");
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
// See that it was received and contains no debug info events.
EXPECT_EQ(2U, mock_server_->requests().size());
@@ -3007,7 +3007,7 @@ TEST_F(SyncerTest, SendDebugInfoEventsOnCommit_PostFailsDontDrop) {
// Generate a debug info event and trigger a commit.
debug_info_getter_->AddDebugEvent();
CreateUnsyncedDirectory("X", "id_X");
- SyncShareNudge();
+ EXPECT_FALSE(SyncShareNudge());
// Verify that the last request sent is a Commit and that it contains a debug
// info event.
@@ -3016,7 +3016,7 @@ TEST_F(SyncerTest, SendDebugInfoEventsOnCommit_PostFailsDontDrop) {
EXPECT_EQ(1, mock_server_->last_request().debug_info().events_size());
// Try again.
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
// Verify that we've received another Commit and that it contains a debug info
// event (just like the previous one).
@@ -3026,7 +3026,7 @@ TEST_F(SyncerTest, SendDebugInfoEventsOnCommit_PostFailsDontDrop) {
// Generate another commit and try again.
CreateUnsyncedDirectory("Y", "id_Y");
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
// See that it was received and contains no debug info events.
EXPECT_EQ(3U, mock_server_->requests().size());
@@ -3055,7 +3055,7 @@ TEST_F(SyncerTest, HugeConflict) {
last_id = next_id;
}
}
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
// Check they're in the expected conflict state.
{
@@ -3072,7 +3072,7 @@ TEST_F(SyncerTest, HugeConflict) {
// Add the missing parent directory.
mock_server_->AddUpdateDirectory(parent_id, TestIdFactory::root(),
"BOB", 2, 20, foreign_cache_guid(), "-3500");
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
// Now they should all be OK.
{
@@ -3089,7 +3089,7 @@ TEST_F(SyncerTest, HugeConflict) {
TEST_F(SyncerTest, DontCrashOnCaseChange) {
mock_server_->AddUpdateDirectory(1, 0, "bob", 1, 10,
foreign_cache_guid(), "-1");
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
{
WriteTransaction trans(FROM_HERE, UNITTEST, directory());
MutableEntry e(&trans, GET_BY_ID, ids_.FromNumber(1));
@@ -3099,25 +3099,25 @@ TEST_F(SyncerTest, DontCrashOnCaseChange) {
mock_server_->set_conflict_all_commits(true);
mock_server_->AddUpdateDirectory(1, 0, "BOB", 2, 20,
foreign_cache_guid(), "-1");
- SyncShareNudge(); // USED TO CAUSE AN ASSERT
+ EXPECT_FALSE(SyncShareNudge()); // USED TO CAUSE AN ASSERT
saw_syncer_event_ = false;
}
TEST_F(SyncerTest, UnsyncedItemAndUpdate) {
mock_server_->AddUpdateDirectory(1, 0, "bob", 1, 10,
foreign_cache_guid(), "-1");
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
mock_server_->set_conflict_all_commits(true);
mock_server_->AddUpdateDirectory(2, 0, "bob", 2, 20,
foreign_cache_guid(), "-2");
- SyncShareNudge(); // USED TO CAUSE AN ASSERT
+ EXPECT_TRUE(SyncShareNudge()); // USED TO CAUSE AN ASSERT
saw_syncer_event_ = false;
}
TEST_F(SyncerTest, NewEntryAndAlteredServerEntrySharePath) {
mock_server_->AddUpdateBookmark(1, 0, "Foo.htm", 10, 10,
foreign_cache_guid(), "-1");
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
int64 local_folder_handle;
syncable::Id local_folder_id;
{
@@ -3136,7 +3136,7 @@ TEST_F(SyncerTest, NewEntryAndAlteredServerEntrySharePath) {
mock_server_->AddUpdateBookmark(1, 0, "Bar.htm", 20, 20,
foreign_cache_guid(), "-1");
mock_server_->set_conflict_all_commits(true);
- SyncShareNudge();
+ EXPECT_FALSE(SyncShareNudge());
saw_syncer_event_ = false;
{
// Update #20 should have been dropped in favor of the local version.
@@ -3155,14 +3155,14 @@ TEST_F(SyncerTest, NewEntryAndAlteredServerEntrySharePath) {
}
// Allow local changes to commit.
mock_server_->set_conflict_all_commits(false);
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
saw_syncer_event_ = false;
// Now add a server change to make the two names equal. There should
// be no conflict with that, since names are not unique.
mock_server_->AddUpdateBookmark(1, 0, "Bar.htm", 30, 30,
foreign_cache_guid(), "-1");
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
saw_syncer_event_ = false;
{
WriteTransaction wtrans(FROM_HERE, UNITTEST, directory());
@@ -3187,7 +3187,7 @@ TEST_F(SyncerTest, NewEntryAndAlteredServerEntrySharePath_OldBookmarksProto) {
mock_server_->set_use_legacy_bookmarks_protocol(true);
mock_server_->AddUpdateBookmark(1, 0, "Foo.htm", 10, 10,
foreign_cache_guid(), "-1");
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
int64 local_folder_handle;
syncable::Id local_folder_id;
{
@@ -3206,7 +3206,7 @@ TEST_F(SyncerTest, NewEntryAndAlteredServerEntrySharePath_OldBookmarksProto) {
mock_server_->AddUpdateBookmark(1, 0, "Bar.htm", 20, 20,
foreign_cache_guid(), "-1");
mock_server_->set_conflict_all_commits(true);
- SyncShareNudge();
+ EXPECT_FALSE(SyncShareNudge());
saw_syncer_event_ = false;
{
// Update #20 should have been dropped in favor of the local version.
@@ -3225,14 +3225,14 @@ TEST_F(SyncerTest, NewEntryAndAlteredServerEntrySharePath_OldBookmarksProto) {
}
// Allow local changes to commit.
mock_server_->set_conflict_all_commits(false);
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
saw_syncer_event_ = false;
// Now add a server change to make the two names equal. There should
// be no conflict with that, since names are not unique.
mock_server_->AddUpdateBookmark(1, 0, "Bar.htm", 30, 30,
foreign_cache_guid(), "-1");
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
saw_syncer_event_ = false;
{
WriteTransaction wtrans(FROM_HERE, UNITTEST, directory());
@@ -3259,7 +3259,7 @@ TEST_F(SyncerTest, SiblingDirectoriesBecomeCircular) {
foreign_cache_guid(), "-1");
mock_server_->AddUpdateDirectory(2, 0, "B", 10, 10,
foreign_cache_guid(), "-2");
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
{
WriteTransaction wtrans(FROM_HERE, UNITTEST, directory());
MutableEntry A(&wtrans, GET_BY_ID, ids_.FromNumber(1));
@@ -3271,7 +3271,7 @@ TEST_F(SyncerTest, SiblingDirectoriesBecomeCircular) {
mock_server_->AddUpdateDirectory(2, 1, "A", 20, 20,
foreign_cache_guid(), "-2");
mock_server_->set_conflict_all_commits(true);
- SyncShareNudge();
+ EXPECT_FALSE(SyncShareNudge());
saw_syncer_event_ = false;
{
WriteTransaction wtrans(FROM_HERE, UNITTEST, directory());
@@ -3291,7 +3291,7 @@ TEST_F(SyncerTest, SwapEntryNames) {
mock_server_->AddUpdateDirectory(2, 0, "B", 10, 10,
foreign_cache_guid(), "-2");
mock_server_->set_conflict_all_commits(true);
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
{
WriteTransaction wtrans(FROM_HERE, UNITTEST, directory());
MutableEntry A(&wtrans, GET_BY_ID, ids_.FromNumber(1));
@@ -3304,7 +3304,7 @@ TEST_F(SyncerTest, SwapEntryNames) {
B.PutNonUniqueName("A");
A.PutNonUniqueName("B");
}
- SyncShareNudge();
+ EXPECT_FALSE(SyncShareNudge());
saw_syncer_event_ = false;
}
@@ -3314,7 +3314,7 @@ TEST_F(SyncerTest, DualDeletionWithNewItemNameClash) {
mock_server_->AddUpdateBookmark(2, 0, "B", 10, 10,
foreign_cache_guid(), "-2");
mock_server_->set_conflict_all_commits(true);
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
{
WriteTransaction trans(FROM_HERE, UNITTEST, directory());
MutableEntry B(&trans, GET_BY_ID, ids_.FromNumber(2));
@@ -3325,7 +3325,7 @@ TEST_F(SyncerTest, DualDeletionWithNewItemNameClash) {
mock_server_->AddUpdateBookmark(2, 0, "A", 11, 11,
foreign_cache_guid(), "-2");
mock_server_->SetLastUpdateDeleted();
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
{
syncable::ReadTransaction trans(FROM_HERE, directory());
Entry B(&trans, GET_BY_ID, ids_.FromNumber(2));
@@ -3344,7 +3344,7 @@ TEST_F(SyncerTest, ResolveWeWroteTheyDeleted) {
mock_server_->AddUpdateBookmark(1, 0, "bob", 1, 10,
foreign_cache_guid(), "-1");
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
{
WriteTransaction trans(FROM_HERE, UNITTEST, directory());
MutableEntry bob(&trans, GET_BY_ID, ids_.FromNumber(1));
@@ -3356,8 +3356,8 @@ TEST_F(SyncerTest, ResolveWeWroteTheyDeleted) {
foreign_cache_guid(), "-1");
mock_server_->SetLastUpdateDeleted();
mock_server_->set_conflict_all_commits(true);
- SyncShareNudge();
- SyncShareNudge();
+ EXPECT_FALSE(SyncShareNudge());
+ EXPECT_FALSE(SyncShareNudge());
{
syncable::ReadTransaction trans(FROM_HERE, directory());
Entry bob(&trans, GET_BY_HANDLE, bob_metahandle);
@@ -3393,9 +3393,9 @@ TEST_F(SyncerTest, DuplicateIDReturn) {
mock_server_->set_next_new_id(10000);
EXPECT_EQ(1u, directory()->unsynced_entity_count());
// we get back a bad id in here (should never happen).
- SyncShareNudge();
+ EXPECT_FALSE(SyncShareNudge());
EXPECT_EQ(1u, directory()->unsynced_entity_count());
- SyncShareNudge(); // another bad id in here.
+ EXPECT_TRUE(SyncShareNudge()); // another bad id in here.
EXPECT_EQ(0u, directory()->unsynced_entity_count());
saw_syncer_event_ = false;
}
@@ -3403,7 +3403,7 @@ TEST_F(SyncerTest, DuplicateIDReturn) {
TEST_F(SyncerTest, DeletedEntryWithBadParentInLoopCalculation) {
mock_server_->AddUpdateDirectory(1, 0, "bob", 1, 10,
foreign_cache_guid(), "-1");
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
{
WriteTransaction trans(FROM_HERE, UNITTEST, directory());
MutableEntry bob(&trans, GET_BY_ID, ids_.FromNumber(1));
@@ -3415,8 +3415,8 @@ TEST_F(SyncerTest, DeletedEntryWithBadParentInLoopCalculation) {
}
mock_server_->AddUpdateDirectory(2, 1, "fred", 1, 10,
foreign_cache_guid(), "-2");
- SyncShareNudge();
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
+ EXPECT_TRUE(SyncShareNudge());
}
TEST_F(SyncerTest, ConflictResolverMergesLocalDeleteAndServerUpdate) {
@@ -3441,7 +3441,7 @@ TEST_F(SyncerTest, ConflictResolverMergesLocalDeleteAndServerUpdate) {
// We don't care about actually committing, just the resolution.
mock_server_->set_conflict_all_commits(true);
- SyncShareNudge();
+ EXPECT_FALSE(SyncShareNudge());
{
syncable::ReadTransaction trans(FROM_HERE, directory());
@@ -3480,7 +3480,7 @@ TEST_F(SyncerTest, UpdateFlipsTheFolderBit) {
mock_server_->set_conflict_all_commits(true);
// The syncer should not attempt to apply the invalid update.
- SyncShareNudge();
+ EXPECT_FALSE(SyncShareNudge());
{
syncable::ReadTransaction trans(FROM_HERE, directory());
@@ -3500,7 +3500,7 @@ TEST_F(SyncerTest, MergingExistingItems) {
mock_server_->set_conflict_all_commits(true);
mock_server_->AddUpdateBookmark(1, 0, "base", 10, 10,
local_cache_guid(), "-1");
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
{
WriteTransaction trans(FROM_HERE, UNITTEST, directory());
MutableEntry entry(
@@ -3509,7 +3509,7 @@ TEST_F(SyncerTest, MergingExistingItems) {
}
mock_server_->AddUpdateBookmark(1, 0, "Copy of base", 50, 50,
local_cache_guid(), "-1");
- SyncShareNudge();
+ EXPECT_FALSE(SyncShareNudge());
}
// In this test a long changelog contains a child at the start of the changelog
@@ -3526,7 +3526,7 @@ TEST_F(SyncerTest, LongChangelistWithApplicationConflict) {
folder_id, "stuck", 1, 1,
foreign_cache_guid(), "-99999");
mock_server_->SetChangesRemaining(depth - 1);
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
// Buffer up a very long series of downloads.
// We should never be stuck (conflict resolution shouldn't
@@ -3537,7 +3537,7 @@ TEST_F(SyncerTest, LongChangelistWithApplicationConflict) {
mock_server_->SetChangesRemaining(depth - i);
}
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
// Ensure our folder hasn't somehow applied.
{
@@ -3554,8 +3554,8 @@ TEST_F(SyncerTest, LongChangelistWithApplicationConflict) {
TestIdFactory::root(), "folder", 1, 1,
foreign_cache_guid(), "-1");
mock_server_->SetChangesRemaining(0);
- SyncShareNudge();
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
+ EXPECT_TRUE(SyncShareNudge());
// Check that everything is as expected after the commit.
{
syncable::ReadTransaction trans(FROM_HERE, directory());
@@ -3574,7 +3574,7 @@ TEST_F(SyncerTest, DontMergeTwoExistingItems) {
foreign_cache_guid(), "-1");
mock_server_->AddUpdateBookmark(2, 0, "base2", 10, 10,
foreign_cache_guid(), "-2");
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
{
WriteTransaction trans(FROM_HERE, UNITTEST, directory());
MutableEntry entry(&trans, GET_BY_ID, ids_.FromNumber(2));
@@ -3584,7 +3584,7 @@ TEST_F(SyncerTest, DontMergeTwoExistingItems) {
}
mock_server_->AddUpdateBookmark(1, 0, "Copy of base", 50, 50,
foreign_cache_guid(), "-1");
- SyncShareNudge();
+ EXPECT_FALSE(SyncShareNudge());
{
syncable::ReadTransaction trans(FROM_HERE, directory());
Entry entry1(&trans, GET_BY_ID, ids_.FromNumber(1));
@@ -3605,11 +3605,11 @@ TEST_F(SyncerTest, TestUndeleteUpdate) {
foreign_cache_guid(), "-1");
mock_server_->AddUpdateDirectory(2, 1, "bar", 1, 2,
foreign_cache_guid(), "-2");
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
mock_server_->AddUpdateDirectory(2, 1, "bar", 2, 3,
foreign_cache_guid(), "-2");
mock_server_->SetLastUpdateDeleted();
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
int64 metahandle;
{
@@ -3622,12 +3622,12 @@ TEST_F(SyncerTest, TestUndeleteUpdate) {
mock_server_->AddUpdateDirectory(1, 0, "foo", 2, 4,
foreign_cache_guid(), "-1");
mock_server_->SetLastUpdateDeleted();
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
// This used to be rejected as it's an undeletion. Now, it results in moving
// the delete path aside.
mock_server_->AddUpdateDirectory(2, 1, "bar", 3, 5,
foreign_cache_guid(), "-2");
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
{
syncable::ReadTransaction trans(FROM_HERE, directory());
Entry entry(&trans, GET_BY_ID, ids_.FromNumber(2));
@@ -3644,7 +3644,7 @@ TEST_F(SyncerTest, TestMoveSanitizedNamedFolder) {
foreign_cache_guid(), "-1");
mock_server_->AddUpdateDirectory(2, 0, ":::", 1, 2,
foreign_cache_guid(), "-2");
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
{
WriteTransaction trans(FROM_HERE, UNITTEST, directory());
MutableEntry entry(&trans, GET_BY_ID, ids_.FromNumber(2));
@@ -3652,11 +3652,11 @@ TEST_F(SyncerTest, TestMoveSanitizedNamedFolder) {
entry.PutParentId(ids_.FromNumber(1));
EXPECT_TRUE(entry.PutIsUnsynced(true));
}
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
// We use the same sync ts as before so our times match up.
mock_server_->AddUpdateDirectory(2, 1, ":::", 2, 2,
foreign_cache_guid(), "-2");
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
}
// Don't crash when this occurs.
@@ -3666,7 +3666,7 @@ TEST_F(SyncerTest, UpdateWhereParentIsNotAFolder) {
mock_server_->AddUpdateDirectory(2, 1, "BookmarkParent", 10, 10,
foreign_cache_guid(), "-2");
// Used to cause a CHECK
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
{
syncable::ReadTransaction rtrans(FROM_HERE, directory());
Entry good_entry(&rtrans, syncable::GET_BY_ID, ids_.FromNumber(1));
@@ -3688,7 +3688,7 @@ TEST_F(SyncerTest, DirectoryUpdateTest) {
mock_server_->AddUpdateDirectory(in_in_root_id, in_root_id,
"in_in_root_name", 3, 3,
foreign_cache_guid(), "-2");
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
{
syncable::ReadTransaction trans(FROM_HERE, directory());
Entry in_root(&trans, GET_BY_ID, in_root_id);
@@ -3726,7 +3726,7 @@ TEST_F(SyncerTest, DirectoryCommitTest) {
bar_metahandle = child.GetMetahandle();
in_dir_id = parent.GetId();
}
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
{
syncable::ReadTransaction trans(FROM_HERE, directory());
Entry fail_by_old_id_entry(&trans, GET_BY_ID, in_root_id);
@@ -3761,7 +3761,7 @@ TEST_F(SyncerTest, TestClientCommandDuringUpdate) {
mock_server_->AddUpdateDirectory(1, 0, "in_root", 1, 1,
foreign_cache_guid(), "-1");
mock_server_->SetGUClientCommand(command);
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
EXPECT_EQ(TimeDelta::FromSeconds(8), last_short_poll_interval_received_);
EXPECT_EQ(TimeDelta::FromSeconds(800), last_long_poll_interval_received_);
@@ -3781,7 +3781,7 @@ TEST_F(SyncerTest, TestClientCommandDuringUpdate) {
mock_server_->AddUpdateDirectory(
1, 0, "in_root", 1, 1, foreign_cache_guid(), "-1");
mock_server_->SetGUClientCommand(command);
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
EXPECT_EQ(TimeDelta::FromSeconds(180), last_short_poll_interval_received_);
EXPECT_EQ(TimeDelta::FromSeconds(190), last_long_poll_interval_received_);
@@ -3805,7 +3805,7 @@ TEST_F(SyncerTest, TestClientCommandDuringCommit) {
command->set_client_invalidation_hint_buffer_size(11);
CreateUnsyncedDirectory("X", "id_X");
mock_server_->SetCommitClientCommand(command);
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
EXPECT_EQ(TimeDelta::FromSeconds(8), last_short_poll_interval_received_);
EXPECT_EQ(TimeDelta::FromSeconds(800), last_long_poll_interval_received_);
@@ -3824,7 +3824,7 @@ TEST_F(SyncerTest, TestClientCommandDuringCommit) {
command->set_client_invalidation_hint_buffer_size(9);
CreateUnsyncedDirectory("Y", "id_Y");
mock_server_->SetCommitClientCommand(command);
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
EXPECT_EQ(TimeDelta::FromSeconds(180), last_short_poll_interval_received_);
EXPECT_EQ(TimeDelta::FromSeconds(190), last_long_poll_interval_received_);
@@ -3841,7 +3841,7 @@ TEST_F(SyncerTest, EnsureWeSendUpOldParent) {
"folder_one", 1, 1, foreign_cache_guid(), "-1");
mock_server_->AddUpdateDirectory(folder_two_id, TestIdFactory::root(),
"folder_two", 1, 1, foreign_cache_guid(), "-2");
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
{
// A moved entry should send an "old parent."
WriteTransaction trans(FROM_HERE, UNITTEST, directory());
@@ -3855,7 +3855,7 @@ TEST_F(SyncerTest, EnsureWeSendUpOldParent) {
create.PutIsUnsynced(true);
create.PutSpecifics(DefaultBookmarkSpecifics());
}
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
const sync_pb::CommitMessage& commit = mock_server_->last_sent_commit();
ASSERT_EQ(2, commit.entries_size());
EXPECT_TRUE(commit.entries(0).parent_id_string() == "2");
@@ -3891,7 +3891,7 @@ TEST_F(SyncerTest, TestSimpleUndelete) {
// Let there be an entry from the server.
mock_server_->AddUpdateBookmark(id, root, "foo", 1, 10,
foreign_cache_guid(), "-1");
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
// Check it out and delete it.
{
WriteTransaction wtrans(FROM_HERE, UNITTEST, directory());
@@ -3903,7 +3903,7 @@ TEST_F(SyncerTest, TestSimpleUndelete) {
// Delete it locally.
entry.PutIsDel(true);
}
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
// Confirm we see IS_DEL and not SERVER_IS_DEL.
{
syncable::ReadTransaction trans(FROM_HERE, directory());
@@ -3914,12 +3914,12 @@ TEST_F(SyncerTest, TestSimpleUndelete) {
EXPECT_TRUE(entry.GetIsDel());
EXPECT_FALSE(entry.GetServerIsDel());
}
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
// Update from server confirming deletion.
mock_server_->AddUpdateBookmark(id, root, "foo", 2, 11,
foreign_cache_guid(), "-1");
mock_server_->SetLastUpdateDeleted();
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
// IS_DEL AND SERVER_IS_DEL now both true.
{
syncable::ReadTransaction trans(FROM_HERE, directory());
@@ -3933,7 +3933,7 @@ TEST_F(SyncerTest, TestSimpleUndelete) {
// Undelete from server.
mock_server_->AddUpdateBookmark(id, root, "foo", 2, 12,
foreign_cache_guid(), "-1");
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
// IS_DEL and SERVER_IS_DEL now both false.
{
syncable::ReadTransaction trans(FROM_HERE, directory());
@@ -3952,7 +3952,7 @@ TEST_F(SyncerTest, TestUndeleteWithMissingDeleteUpdate) {
mock_server_->set_conflict_all_commits(true);
mock_server_->AddUpdateBookmark(id, root, "foo", 1, 10,
foreign_cache_guid(), "-1");
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
// Check it out and delete it.
{
WriteTransaction wtrans(FROM_HERE, UNITTEST, directory());
@@ -3964,7 +3964,7 @@ TEST_F(SyncerTest, TestUndeleteWithMissingDeleteUpdate) {
// Delete it locally.
entry.PutIsDel(true);
}
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
// Confirm we see IS_DEL and not SERVER_IS_DEL.
{
syncable::ReadTransaction trans(FROM_HERE, directory());
@@ -3975,12 +3975,12 @@ TEST_F(SyncerTest, TestUndeleteWithMissingDeleteUpdate) {
EXPECT_TRUE(entry.GetIsDel());
EXPECT_FALSE(entry.GetServerIsDel());
}
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
// Say we do not get an update from server confirming deletion. Undelete
// from server
mock_server_->AddUpdateBookmark(id, root, "foo", 2, 12,
foreign_cache_guid(), "-1");
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
// IS_DEL and SERVER_IS_DEL now both false.
{
syncable::ReadTransaction trans(FROM_HERE, directory());
@@ -4002,10 +4002,10 @@ TEST_F(SyncerTest, TestUndeleteIgnoreCorrectlyUnappliedUpdate) {
foreign_cache_guid(), "-1");
mock_server_->AddUpdateBookmark(id2, root, "foo", 1, 10,
foreign_cache_guid(), "-2");
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
mock_server_->AddUpdateBookmark(id2, root, "foo2", 2, 20,
foreign_cache_guid(), "-2");
- SyncShareNudge(); // Now just don't explode.
+ EXPECT_TRUE(SyncShareNudge()); // Now just don't explode.
}
TEST_F(SyncerTest, ClientTagServerCreatedUpdatesWork) {
@@ -4013,7 +4013,7 @@ TEST_F(SyncerTest, ClientTagServerCreatedUpdatesWork) {
foreign_cache_guid(), "-1");
mock_server_->SetLastUpdateClientTag("permfolder");
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
{
syncable::ReadTransaction trans(FROM_HERE, directory());
@@ -4029,7 +4029,7 @@ TEST_F(SyncerTest, ClientTagServerCreatedUpdatesWork) {
mock_server_->AddUpdateDirectory(1, 0, "permitem_renamed", 10, 100,
foreign_cache_guid(), "-1");
mock_server_->SetLastUpdateClientTag("permfolder");
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
{
syncable::ReadTransaction trans(FROM_HERE, directory());
@@ -4049,7 +4049,7 @@ TEST_F(SyncerTest, ClientTagIllegalUpdateIgnored) {
foreign_cache_guid(), "-1");
mock_server_->SetLastUpdateClientTag("permfolder");
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
{
syncable::ReadTransaction trans(FROM_HERE, directory());
@@ -4065,7 +4065,7 @@ TEST_F(SyncerTest, ClientTagIllegalUpdateIgnored) {
mock_server_->AddUpdateDirectory(1, 0, "permitem_renamed", 10, 100,
foreign_cache_guid(), "-1");
mock_server_->SetLastUpdateClientTag("wrongtag");
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
{
syncable::ReadTransaction trans(FROM_HERE, directory());
@@ -4105,7 +4105,7 @@ TEST_F(SyncerTest, ClientTagUncommittedTagMatchesUpdate) {
"tag", 10, 100);
mock_server_->set_conflict_all_commits(true);
- SyncShareNudge();
+ EXPECT_FALSE(SyncShareNudge());
// This should cause client tag reunion, preserving the metahandle.
{
syncable::ReadTransaction trans(FROM_HERE, directory());
@@ -4124,7 +4124,7 @@ TEST_F(SyncerTest, ClientTagUncommittedTagMatchesUpdate) {
}
mock_server_->set_conflict_all_commits(false);
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
// The resolved entry ought to commit cleanly.
{
@@ -4167,7 +4167,7 @@ TEST_F(SyncerTest, ClientTagConflictWithDeletedLocalEntry) {
ids_.root().GetServerId(),
"tag", 10, 100);
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
// The local entry will be overwritten.
{
syncable::ReadTransaction trans(FROM_HERE, directory());
@@ -4197,7 +4197,7 @@ TEST_F(SyncerTest, ClientTagUpdateClashesWithLocalEntry) {
mock_server_->set_conflict_all_commits(true);
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
int64 tag1_metahandle = syncable::kInvalidMetaHandle;
int64 tag2_metahandle = syncable::kInvalidMetaHandle;
// This should cause client tag overwrite.
@@ -4239,7 +4239,7 @@ TEST_F(SyncerTest, ClientTagUpdateClashesWithLocalEntry) {
mock_server_->AddUpdatePref(id2.GetServerId(), "", "tag1", 12, 120);
syncable::Id id3 = TestIdFactory::MakeServer("3");
mock_server_->AddUpdatePref(id3.GetServerId(), "", "tag2", 13, 130);
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
{
syncable::ReadTransaction trans(FROM_HERE, directory());
@@ -4315,7 +4315,7 @@ TEST_F(SyncerTest, ClientTagClashWithinBatchOfUpdates) {
mock_server_->set_conflict_all_commits(true);
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
// This should cause client tag overwrite.
{
syncable::ReadTransaction trans(FROM_HERE, directory());
@@ -4367,7 +4367,7 @@ TEST_F(SyncerTest, EntryWithParentIdUpdatedWithEntryWithoutParentId) {
mock_server_->AddUpdateSpecifics(1, 0, "Folder", 10, 10, true, 1,
DefaultPreferencesSpecifics());
mock_server_->SetLastUpdateServerTag(ModelTypeToRootTag(PREFERENCES));
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
Id pref_root_id;
{
@@ -4383,7 +4383,7 @@ TEST_F(SyncerTest, EntryWithParentIdUpdatedWithEntryWithoutParentId) {
mock_server_->AddUpdatePref(ids_.FromNumber(2).GetServerId(),
ids_.FromNumber(1).GetServerId(), "tag", 1, 10);
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
{
syncable::ReadTransaction trans(FROM_HERE, directory());
@@ -4397,7 +4397,7 @@ TEST_F(SyncerTest, EntryWithParentIdUpdatedWithEntryWithoutParentId) {
mock_server_->AddUpdatePref(ids_.FromNumber(2).GetServerId(), "", "tag", 2,
20);
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
{
syncable::ReadTransaction trans(FROM_HERE, directory());
@@ -4438,7 +4438,7 @@ TEST_F(SyncerTest, UniqueServerTagUpdates) {
mock_server_->AddUpdateDirectory(
2, 0, "update2", 2, 20, std::string(), std::string());
mock_server_->SetLastUpdateServerTag("bob");
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
{
syncable::ReadTransaction trans(FROM_HERE, directory());
@@ -4469,28 +4469,28 @@ TEST_F(SyncerTest, GetUpdatesSetsRequestedTypes) {
// GetUpdates handler. EnableDatatype sets the expectation value from our
// set of enabled/disabled datatypes.
EnableDatatype(BOOKMARKS);
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
EnableDatatype(AUTOFILL);
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
EnableDatatype(PREFERENCES);
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
DisableDatatype(BOOKMARKS);
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
DisableDatatype(AUTOFILL);
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
DisableDatatype(PREFERENCES);
EnableDatatype(AUTOFILL);
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
}
@@ -4503,7 +4503,7 @@ TEST_F(SyncerTest, UpdateThenCommit) {
mock_server_->AddUpdateDirectory(to_receive, ids_.root(), "x", 1, 10,
foreign_cache_guid(), "-1");
int64 commit_handle = CreateUnsyncedDirectory("y", to_commit);
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
// The sync cycle should have included a GetUpdate, then a commit. By the
// time the commit happened, we should have known for sure that there were no
@@ -4535,7 +4535,7 @@ TEST_F(SyncerTest, UpdateFailsThenDontCommit) {
foreign_cache_guid(), "-1");
int64 commit_handle = CreateUnsyncedDirectory("y", to_commit);
mock_server_->FailNextPostBufferToPathCall();
- SyncShareNudge();
+ EXPECT_FALSE(SyncShareNudge());
syncable::ReadTransaction trans(FROM_HERE, directory());
@@ -4819,11 +4819,11 @@ class SyncerBookmarksTest : public SyncerTest {
TEST_F(SyncerBookmarksTest, CreateSyncThenDeleteSync) {
Create();
ExpectUnsyncedCreation();
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
ExpectSyncedAndCreated();
Delete();
ExpectUnsyncedDeletion();
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
ExpectSyncedAndDeleted();
}
@@ -4852,7 +4852,7 @@ TEST_F(SyncerBookmarksTest, CreateThenDeleteBeforeSync) {
TEST_F(SyncerBookmarksTest, LocalDeleteRemoteChangeConflict) {
Create();
ExpectUnsyncedCreation();
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
ExpectSyncedAndCreated();
Delete();
ExpectUnsyncedDeletion();
@@ -4862,7 +4862,7 @@ TEST_F(SyncerBookmarksTest, LocalDeleteRemoteChangeConflict) {
mock_server_->AddUpdateBookmark(GetServerId(), Id::GetRoot(), "dummy", 10, 10,
local_cache_guid(), local_id_.GetServerId());
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
ExpectSyncedAndDeleted();
}
@@ -4876,7 +4876,7 @@ TEST_F(SyncerBookmarksTest, CreateThenDeleteDuringCommit) {
mock_server_->SetMidCommitCallback(
base::Bind(&SyncerBookmarksTest::Delete, base::Unretained(this)));
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
ExpectSyncedAndDeleted();
}
@@ -4890,7 +4890,7 @@ TEST_F(SyncerBookmarksTest, CreateThenUpdateAndDeleteDuringCommit) {
mock_server_->SetMidCommitCallback(base::Bind(
&SyncerBookmarksTest::UpdateAndDelete, base::Unretained(this)));
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
ExpectSyncedAndDeleted();
}
@@ -5057,7 +5057,7 @@ class SyncerUndeletionTest : public SyncerTest {
TEST_F(SyncerUndeletionTest, UndeleteDuringCommit) {
Create();
ExpectUnsyncedCreation();
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
EXPECT_EQ(0, session_->status_controller().TotalNumConflictingItems());
@@ -5068,7 +5068,7 @@ TEST_F(SyncerUndeletionTest, UndeleteDuringCommit) {
ExpectUnsyncedDeletion();
mock_server_->SetMidCommitCallback(
base::Bind(&SyncerUndeletionTest::Undelete, base::Unretained(this)));
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
// We will continue to commit until all nodes are synced, so we expect
// that both the delete and following undelete were committed. We haven't
@@ -5099,7 +5099,7 @@ TEST_F(SyncerUndeletionTest, UndeleteDuringCommit) {
update->set_originator_cache_guid(local_cache_guid());
update->set_originator_client_item_id(local_id_.GetServerId());
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
EXPECT_EQ(0, session_->status_controller().TotalNumConflictingItems());
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
ExpectSyncedAndCreated();
@@ -5108,7 +5108,7 @@ TEST_F(SyncerUndeletionTest, UndeleteDuringCommit) {
TEST_F(SyncerUndeletionTest, UndeleteBeforeCommit) {
Create();
ExpectUnsyncedCreation();
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
EXPECT_EQ(0, session_->status_controller().TotalNumConflictingItems());
@@ -5119,7 +5119,7 @@ TEST_F(SyncerUndeletionTest, UndeleteBeforeCommit) {
ExpectUnsyncedDeletion();
Undelete();
ExpectUnsyncedEdit(); // Edit, not undelete: server thinks it exists.
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
// The item ought to have committed successfully.
EXPECT_EQ(0, session_->status_controller().TotalNumConflictingItems());
@@ -5136,7 +5136,7 @@ TEST_F(SyncerUndeletionTest, UndeleteBeforeCommit) {
sync_pb::SyncEntity* update = mock_server_->AddUpdateFromLastCommit();
update->set_originator_cache_guid(local_cache_guid());
update->set_originator_client_item_id(local_id_.GetServerId());
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
EXPECT_EQ(0, session_->status_controller().TotalNumConflictingItems());
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
ExpectSyncedAndCreated();
@@ -5145,7 +5145,7 @@ TEST_F(SyncerUndeletionTest, UndeleteBeforeCommit) {
TEST_F(SyncerUndeletionTest, UndeleteAfterCommitButBeforeGetUpdates) {
Create();
ExpectUnsyncedCreation();
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
EXPECT_EQ(0, session_->status_controller().TotalNumConflictingItems());
@@ -5154,7 +5154,7 @@ TEST_F(SyncerUndeletionTest, UndeleteAfterCommitButBeforeGetUpdates) {
// Delete and commit.
Delete();
ExpectUnsyncedDeletion();
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
// The item ought to have committed successfully.
EXPECT_EQ(0, session_->status_controller().TotalNumConflictingItems());
@@ -5168,7 +5168,7 @@ TEST_F(SyncerUndeletionTest, UndeleteAfterCommitButBeforeGetUpdates) {
// Now, encounter a GetUpdates corresponding to the just-committed
// deletion update. The undeletion should prevail.
mock_server_->AddUpdateFromLastCommit();
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
EXPECT_EQ(0, session_->status_controller().TotalNumConflictingItems());
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
ExpectSyncedAndCreated();
@@ -5177,7 +5177,7 @@ TEST_F(SyncerUndeletionTest, UndeleteAfterCommitButBeforeGetUpdates) {
TEST_F(SyncerUndeletionTest, UndeleteAfterDeleteAndGetUpdates) {
Create();
ExpectUnsyncedCreation();
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
EXPECT_EQ(0, session_->status_controller().TotalNumConflictingItems());
@@ -5186,7 +5186,7 @@ TEST_F(SyncerUndeletionTest, UndeleteAfterDeleteAndGetUpdates) {
sync_pb::SyncEntity* update = mock_server_->AddUpdateFromLastCommit();
update->set_originator_cache_guid(local_cache_guid());
update->set_originator_client_item_id(local_id_.GetServerId());
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
EXPECT_EQ(0, session_->status_controller().TotalNumConflictingItems());
ExpectSyncedAndCreated();
@@ -5194,7 +5194,7 @@ TEST_F(SyncerUndeletionTest, UndeleteAfterDeleteAndGetUpdates) {
// Delete and commit.
Delete();
ExpectUnsyncedDeletion();
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
// The item ought to have committed successfully.
EXPECT_EQ(0, session_->status_controller().TotalNumConflictingItems());
@@ -5204,7 +5204,7 @@ TEST_F(SyncerUndeletionTest, UndeleteAfterDeleteAndGetUpdates) {
// Now, encounter a GetUpdates corresponding to the just-committed
// deletion update. Should be consistent.
mock_server_->AddUpdateFromLastCommit();
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
EXPECT_EQ(0, session_->status_controller().TotalNumConflictingItems());
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
ExpectSyncedAndDeleted();
@@ -5215,7 +5215,7 @@ TEST_F(SyncerUndeletionTest, UndeleteAfterDeleteAndGetUpdates) {
// Now, encounter a GetUpdates corresponding to the just-committed
// deletion update. The undeletion should prevail.
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
EXPECT_EQ(0, session_->status_controller().TotalNumConflictingItems());
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
ExpectSyncedAndCreated();
@@ -5225,7 +5225,7 @@ TEST_F(SyncerUndeletionTest, UndeleteAfterDeleteAndGetUpdates) {
TEST_F(SyncerUndeletionTest, UndeleteAfterOtherClientDeletes) {
Create();
ExpectUnsyncedCreation();
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
EXPECT_EQ(0, session_->status_controller().TotalNumConflictingItems());
@@ -5235,7 +5235,7 @@ TEST_F(SyncerUndeletionTest, UndeleteAfterOtherClientDeletes) {
sync_pb::SyncEntity* update1 = mock_server_->AddUpdateFromLastCommit();
update1->set_originator_cache_guid(local_cache_guid());
update1->set_originator_client_item_id(local_id_.GetServerId());
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
EXPECT_EQ(0, session_->status_controller().TotalNumConflictingItems());
ExpectSyncedAndCreated();
@@ -5246,7 +5246,7 @@ TEST_F(SyncerUndeletionTest, UndeleteAfterOtherClientDeletes) {
Entry entry(&trans, GET_BY_HANDLE, metahandle_);
mock_server_->AddUpdateTombstone(entry.GetId(), PREFERENCES);
}
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
// The update ought to have applied successfully.
EXPECT_EQ(0, session_->status_controller().TotalNumConflictingItems());
@@ -5256,7 +5256,7 @@ TEST_F(SyncerUndeletionTest, UndeleteAfterOtherClientDeletes) {
// Undelete it locally.
Undelete();
ExpectUnsyncedUndeletion();
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
EXPECT_EQ(0, session_->status_controller().TotalNumConflictingItems());
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
ExpectSyncedAndCreated();
@@ -5266,7 +5266,7 @@ TEST_F(SyncerUndeletionTest, UndeleteAfterOtherClientDeletes) {
sync_pb::SyncEntity* update2 = mock_server_->AddUpdateFromLastCommit();
update2->set_originator_cache_guid(local_cache_guid());
update2->set_originator_client_item_id(local_id_.GetServerId());
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
EXPECT_EQ(0, session_->status_controller().TotalNumConflictingItems());
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
ExpectSyncedAndCreated();
@@ -5275,7 +5275,7 @@ TEST_F(SyncerUndeletionTest, UndeleteAfterOtherClientDeletes) {
TEST_F(SyncerUndeletionTest, UndeleteAfterOtherClientDeletesImmediately) {
Create();
ExpectUnsyncedCreation();
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
EXPECT_EQ(0, session_->status_controller().TotalNumConflictingItems());
@@ -5288,7 +5288,7 @@ TEST_F(SyncerUndeletionTest, UndeleteAfterOtherClientDeletesImmediately) {
Entry entry(&trans, GET_BY_HANDLE, metahandle_);
mock_server_->AddUpdateTombstone(entry.GetId(), PREFERENCES);
}
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
// The update ought to have applied successfully.
EXPECT_EQ(0, session_->status_controller().TotalNumConflictingItems());
@@ -5298,7 +5298,7 @@ TEST_F(SyncerUndeletionTest, UndeleteAfterOtherClientDeletesImmediately) {
// Undelete it locally.
Undelete();
ExpectUnsyncedUndeletion();
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
EXPECT_EQ(0, session_->status_controller().TotalNumConflictingItems());
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
ExpectSyncedAndCreated();
@@ -5308,7 +5308,7 @@ TEST_F(SyncerUndeletionTest, UndeleteAfterOtherClientDeletesImmediately) {
sync_pb::SyncEntity* update = mock_server_->AddUpdateFromLastCommit();
update->set_originator_cache_guid(local_cache_guid());
update->set_originator_client_item_id(local_id_.GetServerId());
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
EXPECT_EQ(0, session_->status_controller().TotalNumConflictingItems());
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
ExpectSyncedAndCreated();
@@ -5317,7 +5317,7 @@ TEST_F(SyncerUndeletionTest, UndeleteAfterOtherClientDeletesImmediately) {
TEST_F(SyncerUndeletionTest, OtherClientUndeletes) {
Create();
ExpectUnsyncedCreation();
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
EXPECT_EQ(0, session_->status_controller().TotalNumConflictingItems());
@@ -5327,7 +5327,7 @@ TEST_F(SyncerUndeletionTest, OtherClientUndeletes) {
sync_pb::SyncEntity* update = mock_server_->AddUpdateFromLastCommit();
update->set_originator_cache_guid(local_cache_guid());
update->set_originator_client_item_id(local_id_.GetServerId());
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
EXPECT_EQ(0, session_->status_controller().TotalNumConflictingItems());
ExpectSyncedAndCreated();
@@ -5335,7 +5335,7 @@ TEST_F(SyncerUndeletionTest, OtherClientUndeletes) {
// We delete the item.
Delete();
ExpectUnsyncedDeletion();
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
// The update ought to have applied successfully.
EXPECT_EQ(0, session_->status_controller().TotalNumConflictingItems());
@@ -5345,7 +5345,7 @@ TEST_F(SyncerUndeletionTest, OtherClientUndeletes) {
// Now, encounter a GetUpdates corresponding to the just-committed
// deletion update.
mock_server_->AddUpdateFromLastCommit();
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
EXPECT_EQ(0, session_->status_controller().TotalNumConflictingItems());
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
ExpectSyncedAndDeleted();
@@ -5360,7 +5360,7 @@ TEST_F(SyncerUndeletionTest, OtherClientUndeletes) {
client_tag_, 100, 1000);
}
mock_server_->SetLastUpdateClientTag(client_tag_);
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
EXPECT_EQ(0, session_->status_controller().TotalNumConflictingItems());
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
ExpectSyncedAndCreated();
@@ -5369,7 +5369,7 @@ TEST_F(SyncerUndeletionTest, OtherClientUndeletes) {
TEST_F(SyncerUndeletionTest, OtherClientUndeletesImmediately) {
Create();
ExpectUnsyncedCreation();
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
EXPECT_EQ(0, session_->status_controller().TotalNumConflictingItems());
@@ -5383,7 +5383,7 @@ TEST_F(SyncerUndeletionTest, OtherClientUndeletesImmediately) {
Entry entry(&trans, GET_BY_HANDLE, metahandle_);
update->set_originator_client_item_id(local_id_.GetServerId());
}
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
EXPECT_EQ(0, session_->status_controller().TotalNumConflictingItems());
ExpectSyncedAndCreated();
@@ -5391,7 +5391,7 @@ TEST_F(SyncerUndeletionTest, OtherClientUndeletesImmediately) {
// We delete the item.
Delete();
ExpectUnsyncedDeletion();
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
// The update ought to have applied successfully.
EXPECT_EQ(0, session_->status_controller().TotalNumConflictingItems());
@@ -5409,7 +5409,7 @@ TEST_F(SyncerUndeletionTest, OtherClientUndeletesImmediately) {
client_tag_, 100, 1000);
}
mock_server_->SetLastUpdateClientTag(client_tag_);
- SyncShareNudge();
+ EXPECT_TRUE(SyncShareNudge());
EXPECT_EQ(0, session_->status_controller().TotalNumConflictingItems());
EXPECT_EQ(1, mock_server_->GetAndClearNumGetUpdatesRequests());
ExpectSyncedAndCreated();
@@ -5470,7 +5470,8 @@ TEST_P(MixedResult, ExtensionsActivity) {
context_->extensions_activity()->PutRecords(records);
}
- SyncShareNudge();
+ EXPECT_EQ(!ShouldFailBookmarkCommit() && !ShouldFailAutofillCommit(),
+ SyncShareNudge());
ExtensionsActivity::Records final_monitor_records;
context_->extensions_activity()->GetAndClearRecords(&final_monitor_records);
« no previous file with comments | « sync/engine/syncer.cc ('k') | sync/internal_api/js_sync_manager_observer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698