diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-20 19:07:19 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-20 19:07:19 +0000 |
| commit | 1b0f1e169e3d747080449c6d54c1965b597ff5f9 (patch) | |
| tree | af91a9e77a105025dfa7cc31f6a39b394e33f033 /tools/valgrind/chrome_tests.py | |
| parent | 6cd252d36ae6b4b379f145381d523db1c488d9d4 (diff) | |
| download | chromium_src-1b0f1e169e3d747080449c6d54c1965b597ff5f9.zip chromium_src-1b0f1e169e3d747080449c6d54c1965b597ff5f9.tar.gz chromium_src-1b0f1e169e3d747080449c6d54c1965b597ff5f9.tar.bz2 | |
GTTF: Remove wait_for_terminate_timeout_ms in favor of action_max_timeout_ms
Reducing number of different timeouts makes it easier to choose one.
BUG=none
Review URL: http://codereview.chromium.org/7055007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86127 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/valgrind/chrome_tests.py')
| -rwxr-xr-x | tools/valgrind/chrome_tests.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/valgrind/chrome_tests.py b/tools/valgrind/chrome_tests.py index fb45f55..8662c23 100755 --- a/tools/valgrind/chrome_tests.py +++ b/tools/valgrind/chrome_tests.py @@ -273,8 +273,7 @@ class ChromeTests: UI_VALGRIND_ARGS = ["--timeout=7200", "--trace_children", "--indirect"] # UI test timeouts are in milliseconds. UI_TEST_ARGS = ["--ui-test-action-timeout=120000", - "--ui-test-action-max-timeout=280000", - "--ui-test-terminate-timeout=120000"] + "--ui-test-action-max-timeout=280000"] def TestUI(self): return self.SimpleTest("chrome", "ui_tests", valgrind_test_args=self.UI_VALGRIND_ARGS, |