diff options
| author | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-02 06:21:03 +0000 |
|---|---|---|
| committer | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-02 06:21:03 +0000 |
| commit | 13d2f7554a8b6b3314e136d0f4fbcc159d8f8cb6 (patch) | |
| tree | 4ad5350ac7518fe84c512fee537af10124c711b8 /chrome | |
| parent | 275507b3e582ceaa6c215773073abe92aa282310 (diff) | |
| download | chromium_src-13d2f7554a8b6b3314e136d0f4fbcc159d8f8cb6.zip chromium_src-13d2f7554a8b6b3314e136d0f4fbcc159d8f8cb6.tar.gz chromium_src-13d2f7554a8b6b3314e136d0f4fbcc159d8f8cb6.tar.bz2 | |
Mark PauseWhenNotConnected as flaky as it keeps timing out,
and ServerDeletingFolderWeHaveAnOpenEntryIn is failing 100% of the time.
BUG=39070, 46621
TEST=Syncer unittest, SyncerThreadTest
TBR=skrul
Review URL: http://codereview.chromium.org/2873039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51505 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/sync/engine/syncer_thread_unittest.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/sync/engine/syncer_unittest.cc | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/sync/engine/syncer_thread_unittest.cc b/chrome/browser/sync/engine/syncer_thread_unittest.cc index 5523838..0129eb6 100644 --- a/chrome/browser/sync/engine/syncer_thread_unittest.cc +++ b/chrome/browser/sync/engine/syncer_thread_unittest.cc @@ -841,7 +841,8 @@ TEST_F(SyncerThreadWithSyncerTest, StartWhenNotConnected) { EXPECT_TRUE(syncer_thread()->Stop(2000)); } -TEST_F(SyncerThreadWithSyncerTest, PauseWhenNotConnected) { +// See bug 39070. +TEST_F(SyncerThreadWithSyncerTest, FLAKY_PauseWhenNotConnected) { WaitableEvent sync_cycle_ended_event(false, false); WaitableEvent event(false, false); ListenerMock listener; diff --git a/chrome/browser/sync/engine/syncer_unittest.cc b/chrome/browser/sync/engine/syncer_unittest.cc index 6933cd4..685a7ba 100644 --- a/chrome/browser/sync/engine/syncer_unittest.cc +++ b/chrome/browser/sync/engine/syncer_unittest.cc @@ -2495,7 +2495,7 @@ TEST_F(SyncerTest, ServerDeletingFolderWeHaveMovedSomethingInto) { // 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. // http://crbug.com/46621 -TEST_F(SyncerTest, FAILS_ServerDeletingFolderWeHaveAnOpenEntryIn) { +TEST_F(SyncerTest, DISABLED_ServerDeletingFolderWeHaveAnOpenEntryIn) { ScopedDirLookup dir(syncdb_.manager(), syncdb_.name()); CHECK(dir.good()); mock_server_->AddUpdateBookmark(1, 0, "bob", 1, 10); |