summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync
diff options
context:
space:
mode:
authorvandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-18 20:46:08 +0000
committervandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-18 20:46:08 +0000
commit50a74ff479715365b1eb54bee405b184b499ce36 (patch)
tree1d70a5e64b95003dccb91366feeae48a520fbb06 /chrome/browser/sync
parent4dfd2d97a5fd18c2fe0ce0fc12776b22259814c9 (diff)
downloadchromium_src-50a74ff479715365b1eb54bee405b184b499ce36.zip
chromium_src-50a74ff479715365b1eb54bee405b184b499ce36.tar.gz
chromium_src-50a74ff479715365b1eb54bee405b184b499ce36.tar.bz2
TTF: Disabled test, SyncerTest.FAILS_ServerDeletingFolderWeHaveAnOpenEntryIn
BUG=46621 TEST=none Review URL: http://codereview.chromium.org/2851013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50277 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync')
-rw-r--r--chrome/browser/sync/engine/syncer_unittest.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/sync/engine/syncer_unittest.cc b/chrome/browser/sync/engine/syncer_unittest.cc
index f7946f5..6eebcd6 100644
--- a/chrome/browser/sync/engine/syncer_unittest.cc
+++ b/chrome/browser/sync/engine/syncer_unittest.cc
@@ -2558,7 +2558,8 @@ TEST_F(SyncerTest, ServerDeletingFolderWeHaveMovedSomethingInto) {
// interesting case the 4th time SyncShare is called.
// TODO(chron): The fourth time that SyncShare is called it crashes.
// This seems to be due to a bug in the conflict set building logic.
-TEST_F(SyncerTest, DISABLED_ServerDeletingFolderWeHaveAnOpenEntryIn) {
+// http://crbug.com/46621
+TEST_F(SyncerTest, FAILS_ServerDeletingFolderWeHaveAnOpenEntryIn) {
ScopedDirLookup dir(syncdb_.manager(), syncdb_.name());
CHECK(dir.good());
mock_server_->AddUpdateBookmark(1, 0, "bob", 1, 10);