diff options
| author | miu@chromium.org <miu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-14 23:11:33 +0000 |
|---|---|---|
| committer | miu@chromium.org <miu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-14 23:13:09 +0000 |
| commit | 81f1ad89d2f627f8dcc7f1ebeb407eba6c454587 (patch) | |
| tree | 58bf1ae3688f816cbd3387edc630c634833d55dc /sync/sync_tests.gypi | |
| parent | 97b8624b5b6659d96862048f1920e0723a262ced (diff) | |
| download | chromium_src-81f1ad89d2f627f8dcc7f1ebeb407eba6c454587.zip chromium_src-81f1ad89d2f627f8dcc7f1ebeb407eba6c454587.tar.gz chromium_src-81f1ad89d2f627f8dcc7f1ebeb407eba6c454587.tar.bz2 | |
Revert of Let SyncBackupManager keep backup data in memory until shutdown. Only persist (patchset #3 of https://codereview.chromium.org/455023003/)
Reason for revert:
sync_unit_tests broke on Linux dbg bot.
http://build.chromium.org/p/chromium.linux/buildstatus?builder=Linux%20Tests%20%28dbg%29%282%29&number=48388
------------------------------------------------------------
[ RUN ] SyncManagerTestWithMockScheduler.ReConfiguration
GMOCK WARNING:
Uninteresting mock function call - returning directly.
Function call: Start(0)
NOTE: You can safely ignore the above warning unless this call should not happen. Do not suppress it by blindly adding an EXPECT_CALL() if you don't mean to enforce the call. See http://code.google.com/p/googlemock/wiki/CookBook#Knowing_When_to_Expect for details.
Stack trace:
../../sync/internal_api/sync_manager_impl_unittest.cc:838: Failure
Value of: storage_used_
Actual: 2880154539
Expected: InternalComponentsFactory::STORAGE_ON_DISK
Which is: 1
[ FAILED ] SyncManagerTestWithMockScheduler.ReConfiguration (34 ms)
[828/829] SyncManagerTestWithMockScheduler.ReConfiguration (34 ms)
[0814/160010:ERROR:kill_posix.cc(191)] Unable to terminate process group 6975: No such process
[ RUN ] SyncManagerTestWithMockScheduler.BasicConfiguration
GMOCK WARNING:
Uninteresting mock function call - returning directly.
Function call: Start(0)
NOTE: You can safely ignore the above warning unless this call should not happen. Do not suppress it by blindly adding an EXPECT_CALL() if you don't mean to enforce the call. See http://code.google.com/p/googlemock/wiki/CookBook#Knowing_When_to_Expect for details.
Stack trace:
../../sync/internal_api/sync_manager_impl_unittest.cc:838: Failure
Value of: storage_used_
Actual: 2880154539
Expected: InternalComponentsFactory::STORAGE_ON_DISK
Which is: 1
[ FAILED ] SyncManagerTestWithMockScheduler.BasicConfiguration (29 ms)
[829/829] SyncManagerTestWithMockScheduler.BasicConfiguration (29 ms)
Original issue's description:
> Let SyncBackupManager keep backup data in memory until shutdown. Only persist
> backup data to disk if shutdown is due to switching to sync.
>
> BUG=362679
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=289709
TBR=zea@chromium.org,haitaol@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=362679
Review URL: https://codereview.chromium.org/477813002
Cr-Commit-Position: refs/heads/master@{#289718}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289718 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/sync_tests.gypi')
| -rw-r--r-- | sync/sync_tests.gypi | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sync/sync_tests.gypi b/sync/sync_tests.gypi index ddcdf25..b7b68c3 100644 --- a/sync/sync_tests.gypi +++ b/sync/sync_tests.gypi @@ -317,7 +317,6 @@ 'sessions/model_type_registry_unittest.cc', 'sessions/nudge_tracker_unittest.cc', 'sessions/status_controller_unittest.cc', - 'syncable/deferred_on_disk_directory_backing_store_unittest.cc', 'syncable/directory_backing_store_unittest.cc', 'syncable/directory_unittest.cc', 'syncable/directory_unittest.h', |