diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-13 06:29:57 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-13 06:29:57 +0000 |
| commit | 585d932a893f3eaf7edce8f5718efa088957c7b2 (patch) | |
| tree | df3caaa3c8c09a08b904eb7b50488ce8502238ce /chrome | |
| parent | 285b32fea5b281a05acd2795756a79ee2e7e0900 (diff) | |
| download | chromium_src-585d932a893f3eaf7edce8f5718efa088957c7b2.zip chromium_src-585d932a893f3eaf7edce8f5718efa088957c7b2.tar.gz chromium_src-585d932a893f3eaf7edce8f5718efa088957c7b2.tar.bz2 | |
Mark SessionRestoreUITest.ShareProcessesOnRestore as flaky on Linux and Mac.
BUG=52022
TEST=greener tree
Review URL: http://codereview.chromium.org/3156007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56001 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/sessions/session_restore_uitest.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/sessions/session_restore_uitest.cc b/chrome/browser/sessions/session_restore_uitest.cc index e084d9c..068a350 100644 --- a/chrome/browser/sessions/session_restore_uitest.cc +++ b/chrome/browser/sessions/session_restore_uitest.cc @@ -438,13 +438,19 @@ TEST_F(SessionRestoreUITest, ASSERT_EQ(url1_, GetActiveTabURL()); } +#if defined(OS_LINUX) || defined(OS_MACOSX) +// Flaky, sometimes times out: http://crbug.com/52022 +#define MAYBE_ShareProcessesOnRestore FLAKY_ShareProcessesOnRestore +#else +#define MAYBE_ShareProcessesOnRestore ShareProcessesOnRestore +#endif // Make sure after a restore the number of processes matches that of the number // of processes running before the restore. This creates a new tab so that // we should have two new tabs running. (This test will pass in both // 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) { +TEST_F(SessionRestoreUITest, MAYBE_ShareProcessesOnRestore) { if (in_process_renderer()) { // No point in running this test in single process mode. return; |