diff options
| author | tzik <tzik@chromium.org> | 2014-09-01 01:36:21 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-01 08:38:04 +0000 |
| commit | af2ddaa039f67b19e193a8836aeec43bd45fd839 (patch) | |
| tree | ebcf70cf3898a70436e21b80c58b9fea9c1f12fc | |
| parent | 5d13a2b12e8cef22465edfd7113e002d257da117 (diff) | |
| download | chromium_src-af2ddaa039f67b19e193a8836aeec43bd45fd839.zip chromium_src-af2ddaa039f67b19e193a8836aeec43bd45fd839.tar.gz chromium_src-af2ddaa039f67b19e193a8836aeec43bd45fd839.tar.bz2 | |
[SyncFS] Deflake SyncFileSystemServiceTest.SimpleLocalSyncFlow
Fix mock expectation for the flaky test.
BUG=408443
TEST=unit_tests --gtest_filter=SyncFileSystemServiceTest.SimpleLocalSyncFlow
Review URL: https://codereview.chromium.org/524193004
Cr-Commit-Position: refs/heads/master@{#292850}
| -rw-r--r-- | chrome/browser/sync_file_system/sync_file_system_service_unittest.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/sync_file_system/sync_file_system_service_unittest.cc b/chrome/browser/sync_file_system/sync_file_system_service_unittest.cc index 6a20476..2fa846b 100644 --- a/chrome/browser/sync_file_system/sync_file_system_service_unittest.cc +++ b/chrome/browser/sync_file_system/sync_file_system_service_unittest.cc @@ -353,6 +353,9 @@ TEST_F(SyncFileSystemServiceTest, SimpleLocalSyncFlow) { EXPECT_CALL(*mock_local_change_processor(), ApplyLocalChange(change, _, _, kFile, _)) .WillOnce(MockStatusCallback(SYNC_STATUS_OK)); + EXPECT_CALL(*mock_remote_service(), ProcessRemoteChange(_)) + .WillRepeatedly(MockSyncFileCallback(SYNC_STATUS_NO_CHANGE_TO_SYNC, + FileSystemURL())); EXPECT_CALL(*mock_remote_service(), PromoteDemotedChanges(_)) .WillRepeatedly(InvokeCompletionClosure()); |