diff options
| author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-09 03:59:33 +0000 |
|---|---|---|
| committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-09 03:59:33 +0000 |
| commit | b78fd9d54740d06a24d5b3e9f30582df6a36f201 (patch) | |
| tree | bf082023374a78cdd393045f6b3a425ad148a1cb /chrome | |
| parent | 61b84d5d212129231137839524448b6205f7e097 (diff) | |
| download | chromium_src-b78fd9d54740d06a24d5b3e9f30582df6a36f201.zip chromium_src-b78fd9d54740d06a24d5b3e9f30582df6a36f201.tar.gz chromium_src-b78fd9d54740d06a24d5b3e9f30582df6a36f201.tar.bz2 | |
Increase subprocess test timeout from 30-->45 seconds and re-enable
BrowserTest.ThirtyFourTabs on Mac. (This test takes <3 seconds on my
machine). Suspect low memory conditions (or whatever) on the bot;
this test is not problematic per se.
BUG=http://crbug.com/43862
TEST=bots stay green
Review URL: http://codereview.chromium.org/2900002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51928 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/browser_browsertest.cc | 12 | ||||
| -rw-r--r-- | chrome/test/test_launcher/out_of_proc_test_runner.cc | 4 |
2 files changed, 6 insertions, 10 deletions
diff --git a/chrome/browser/browser_browsertest.cc b/chrome/browser/browser_browsertest.cc index 8cd76d8..0525058 100644 --- a/chrome/browser/browser_browsertest.cc +++ b/chrome/browser/browser_browsertest.cc @@ -225,15 +225,9 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_JavascriptAlertActivatesTab) { // exact number of processes depends on the amount of memory. Previously we // had a hard limit of 31 processes and this test is mainly directed at // verifying that we don't crash when we pass this limit. - -// BrowserTest.ThirtyFourTabs times out on Mac, see http://crbug.com/43862 -#if defined OS_MACOSX -#define MAYBE_ThirtyFourTabs DISABLED_ThirtyFourTabs -#else -#define MAYBE_ThirtyFourTabs ThirtyFourTabs -#endif - -IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_ThirtyFourTabs) { +// Warning: this test can take >30 seconds when running on a slow (low +// memory?) Mac builder. +IN_PROC_BROWSER_TEST_F(BrowserTest, ThirtyFourTabs) { GURL url(ui_test_utils::GetTestUrl(FilePath(FilePath::kCurrentDirectory), FilePath(kTitle2File))); diff --git a/chrome/test/test_launcher/out_of_proc_test_runner.cc b/chrome/test/test_launcher/out_of_proc_test_runner.cc index 766314c..2e318b6 100644 --- a/chrome/test/test_launcher/out_of_proc_test_runner.cc +++ b/chrome/test/test_launcher/out_of_proc_test_runner.cc @@ -38,7 +38,9 @@ const char kTestTerminateTimeoutFlag[] = "test-terminate-timeout"; const char kChildProcessFlag[] = "child"; const char kHelpFlag[] = "help"; -const int64 kDefaultTestTimeoutMs = 30000; +// This value was changed from 30000 (30sec) to 45000 due to +// http://crbug.com/43862. +const int64 kDefaultTestTimeoutMs = 45000; class OutOfProcTestRunner : public tests::TestRunner { public: |