| Index: content/test/gpu/gpu_tests/gpu_process_integration_test.py
|
| diff --git a/content/test/gpu/gpu_tests/gpu_process_integration_test.py b/content/test/gpu/gpu_tests/gpu_process_integration_test.py
|
| index 89691eda838269eccba0a3f3697094bb70fda2f0..a3dc144cfb7057ce79ae479254d741cc56a86955 100644
|
| --- a/content/test/gpu/gpu_tests/gpu_process_integration_test.py
|
| +++ b/content/test/gpu/gpu_tests/gpu_process_integration_test.py
|
| @@ -115,7 +115,8 @@ class GpuProcessIntegrationTest(gpu_integration_test.GpuIntegrationTest):
|
| ('GpuProcess_identify_active_gpu2', 'chrome:gpu'),
|
| ('GpuProcess_identify_active_gpu3', 'chrome:gpu'),
|
| ('GpuProcess_identify_active_gpu4', 'chrome:gpu'),
|
| - ('GpuProcess_software_gpu_process', 'about:blank'))
|
| + ('GpuProcess_software_gpu_process', 'about:blank'),
|
| + ('GpuProcess_disabling_workarounds_works', 'chrome:gpu'))
|
|
|
| # The earlier has_transparent_visuals_gpu_process and
|
| # no_transparent_visuals_gpu_process tests became no-ops in
|
| @@ -526,6 +527,22 @@ class GpuProcessIntegrationTest(gpu_integration_test.GpuIntegrationTest):
|
| self._Navigate(test_path)
|
| self._VerifyGpuProcessPresent()
|
|
|
| + def _GpuProcess_disabling_workarounds_works(self, test_path):
|
| + # Hit exception from id 215 from kGpuDriverBugListJson.
|
| + self.RestartBrowserIfNecessaryWithArgs([
|
| + '--gpu-testing-vendor-id=0xbad9',
|
| + '--gpu-testing-device-id=0xbad9',
|
| + '--gpu-testing-secondary-vendor-ids=',
|
| + '--gpu-testing-secondary-device-ids=',
|
| + '--gpu-testing-gl-vendor=FakeVendor',
|
| + '--gpu-testing-gl-renderer=FakeRenderer',
|
| + '--use_gpu_driver_workaround_for_testing=0'])
|
| + self._Navigate(test_path)
|
| + workarounds, _ = (
|
| + self._CompareAndCaptureDriverBugWorkarounds())
|
| + if 'use_gpu_driver_workaround_for_testing' in workarounds:
|
| + self.fail('use_gpu_driver_workaround_for_testing erroneously present')
|
| +
|
| def load_tests(loader, tests, pattern):
|
| del loader, tests, pattern # Unused.
|
| return gpu_integration_test.LoadAllTestsInModule(sys.modules[__name__])
|
|
|