chrome/browser/sync/syncable/directory_backing_store_unittest.cc - Issue 8586004: Revert 110356 - Sync: Improve handling of database load failures

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/sync/syncable/directory_backing_store_unittest.cc

Issue 8586004: Revert 110356 - Sync: Improve handling of database load failures (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/sync/syncable/directory_backing_store_unittest.cc

===================================================================

--- chrome/browser/sync/syncable/directory_backing_store_unittest.cc (revision 110383)

+++ chrome/browser/sync/syncable/directory_backing_store_unittest.cc (working copy)

@@ -2082,7 +2082,15 @@

scoped_ptr<DirectoryBackingStore> dbs(

new DirectoryBackingStore(GetUsername(), GetDatabasePath()));

- EXPECT_FALSE(dbs->BeginLoad());

+ // In release mode, we expect the sync database to nuke itself and start

+ // over if it detects invalid/corrupted data.

+#if defined(NDEBUG) && !defined(DCHECK_ALWAYS_ON)

+ EXPECT_TRUE(dbs->BeginLoad());

+#elif defined(NDEBUG) && defined(DCHECK_ALWAYS_ON)

+ EXPECT_DEATH(dbs->BeginLoad(), "stmt_");

+#else

+ EXPECT_DEATH(dbs->BeginLoad(), "sqlite error");

+#endif

}