| commit | e074b5b77430bb0920bbf3453cf9bb3af648ce6e | [log] [tgz] |
|---|---|---|
| author | Ilja H. Friedel <ihf@chromium.org> | Mon Nov 16 18:18:04 2015 -0800 |
| committer | Ilja Friedel <ihf@chromium.org> | Tue Nov 17 02:34:31 2015 +0000 |
| tree | cefd387dc26cfcfcd3aa275affbb987abab15c84 | |
| parent | 3fc31554e6262c54a3a3aa4deea7c0b7a77ce269 [diff] |
graphics_WebGLPerformance: reduce timeout. It was requested to reduce back to 30 minutes. TEST=None. BUG=chromium:551042 Change-Id: I7d259a172b939742d51274348bd1d30b4be8c843 Reviewed-on: https://chromium-review.googlesource.com/312698 Reviewed-by: Ilja Friedel <ihf@chromium.org> Tested-by: Ilja Friedel <ihf@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/312834
diff --git a/client/site_tests/graphics_WebGLPerformance/graphics_WebGLPerformance.py b/client/site_tests/graphics_WebGLPerformance/graphics_WebGLPerformance.py index c30be20..5550b6e 100644 --- a/client/site_tests/graphics_WebGLPerformance/graphics_WebGLPerformance.py +++ b/client/site_tests/graphics_WebGLPerformance/graphics_WebGLPerformance.py
@@ -118,10 +118,6 @@ @param test_duration_secs: The test duration in seconds. @param fullscreen: Whether to run the test in fullscreen. """ - # TODO(ihf): Remove the timeout increase once crbug.com/551042 is fixed. - gpu_type = utils.get_gpu_family() - if gpu_type == 'pinetrail' or gpu_type == 'mali': - test_duration_secs = 7200 self._test_duration_secs = test_duration_secs ext_paths = []