commit | 06aea8f52a6cdeeeefc0dabfa36d5b6dc93ca82c | [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:12 2015 +0000 |
tree | 3a5b4b55d842978450fa65811f1ca88af7b64af1 | |
parent | 30ad931056c2fbfd428a31d5739f3065efa80466 [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/312900
diff --git a/client/site_tests/graphics_WebGLPerformance/graphics_WebGLPerformance.py b/client/site_tests/graphics_WebGLPerformance/graphics_WebGLPerformance.py index 1a9cc2d..999d218 100644 --- a/client/site_tests/graphics_WebGLPerformance/graphics_WebGLPerformance.py +++ b/client/site_tests/graphics_WebGLPerformance/graphics_WebGLPerformance.py
@@ -106,10 +106,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 = []