diff options
| author | asargent@chromium.org <asargent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-13 18:10:25 +0000 |
|---|---|---|
| committer | asargent@chromium.org <asargent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-13 18:10:25 +0000 |
| commit | 1adcf625af7034de6f76deb030d606378aa0193b (patch) | |
| tree | 3c0df8ff1806f2e3547ed3805955d0fdbc0c31c7 /base/files | |
| parent | 6580ca1a795c564b963244e5ff10b624c883d37c (diff) | |
| download | chromium_src-1adcf625af7034de6f76deb030d606378aa0193b.zip chromium_src-1adcf625af7034de6f76deb030d606378aa0193b.tar.gz chromium_src-1adcf625af7034de6f76deb030d606378aa0193b.tar.bz2 | |
Mark FilePathWatcherTest.DestroyWithPendingNotification as FLAKY on MacOS
BUG=85930
TEST=none
TBR=phajdan.jr@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88851 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/files')
| -rw-r--r-- | base/files/file_path_watcher_browsertest.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/base/files/file_path_watcher_browsertest.cc b/base/files/file_path_watcher_browsertest.cc index 7bee617..04567a8 100644 --- a/base/files/file_path_watcher_browsertest.cc +++ b/base/files/file_path_watcher_browsertest.cc @@ -285,7 +285,13 @@ TEST_F(FilePathWatcherTest, DeleteDuringNotify) { // Verify that deleting the watcher works even if there is a pending // notification. -TEST_F(FilePathWatcherTest, DestroyWithPendingNotification) { +// Flaky on MacOS. http://crbug.com/85930 +#if defined(OS_MACOSX) +#define MAYBE_DestroyWithPendingNotification FLAKY_DestroyWithPendingNotification +#else +#define MAYBE_DestroyWithPendingNotification DestroyWithPendingNotification +#endif +TEST_F(FilePathWatcherTest, MAYBE_DestroyWithPendingNotification) { scoped_refptr<TestDelegate> delegate(new TestDelegate(collector())); FilePathWatcher* watcher = new FilePathWatcher; ASSERT_TRUE(SetupWatch(test_file(), watcher, delegate.get())); |