diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-31 18:28:47 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-31 18:28:47 +0000 |
| commit | be2b615c98d090d35e8bb4a6eb739fdd35ce996e (patch) | |
| tree | 22df2aaa480e7ef72fb566c95c48765e7b909845 /chrome/browser/sessions | |
| parent | e79ed068e8c88bcd5f9d4654046e601862df97fa (diff) | |
| download | chromium_src-be2b615c98d090d35e8bb4a6eb739fdd35ce996e.zip chromium_src-be2b615c98d090d35e8bb4a6eb739fdd35ce996e.tar.gz chromium_src-be2b615c98d090d35e8bb4a6eb739fdd35ce996e.tar.bz2 | |
Marks test as flaky on mac.
BUG=52022
TEST=none
TBR=davemoore@chromium.org
Review URL: http://codereview.chromium.org/6260037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73164 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sessions')
| -rw-r--r-- | chrome/browser/sessions/session_restore_uitest.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/sessions/session_restore_uitest.cc b/chrome/browser/sessions/session_restore_uitest.cc index 1985e9d..f4cdd4f 100644 --- a/chrome/browser/sessions/session_restore_uitest.cc +++ b/chrome/browser/sessions/session_restore_uitest.cc @@ -450,7 +450,14 @@ TEST_F(SessionRestoreUITest, TwoWindowsCloseOneRestoreOnlyOne) { // process-per-site and process-per-site-instance, because we treat the new tab // as a special case in process-per-site-instance so that it only ever uses one // process.) -TEST_F(SessionRestoreUITest, ShareProcessesOnRestore) { + +// Flaky on mac: http://code.google.com/p/chromium/issues/detail?id=52022 +#if defined(OS_MACOSX) +#define MAYBE_ShareProcessesOnRestore FLAKY_ShareProcessesOnRestore +#else +#define MAYBE_ShareProcessesOnRestore ShareProcessesOnRestore +#endif +TEST_F(SessionRestoreUITest, MAYBE_ShareProcessesOnRestore) { if (ProxyLauncher::in_process_renderer()) { // No point in running this test in single process mode. return; |