Index: content/test/gpu/gpu_tests/context_lost_integration_test.py |
diff --git a/content/test/gpu/gpu_tests/context_lost_integration_test.py b/content/test/gpu/gpu_tests/context_lost_integration_test.py |
index b6bb4fd11362c6a879108c7233b88e1de266017d..5e9fa06f8161dcdcbbe817055eb8dd3dcf8cc167 100644 |
--- a/content/test/gpu/gpu_tests/context_lost_integration_test.py |
+++ b/content/test/gpu/gpu_tests/context_lost_integration_test.py |
@@ -70,17 +70,17 @@ class ContextLostIntegrationTest(gpu_integration_test.GpuIntegrationTest): |
@classmethod |
def GenerateGpuTests(cls, options): |
- tests = (('GPUProcessCrashesExactlyOncePerVisitToAboutGpuCrash', |
+ tests = (('GpuCrash_GPUProcessCrashesExactlyOncePerVisitToAboutGpuCrash', |
'gpu_process_crash.html'), |
- ('WebGLContextLostFromGPUProcessExit', |
+ ('ContextLost_WebGLContextLostFromGPUProcessExit', |
'webgl.html?query=kill_after_notification'), |
- ('WebGLContextLostFromLoseContextExtension', |
+ ('ContextLost_WebGLContextLostFromLoseContextExtension', |
'webgl.html?query=WEBGL_lose_context'), |
- ('WebGLContextLostFromQuantity', |
+ ('ContextLost_WebGLContextLostFromQuantity', |
'webgl.html?query=forced_quantity_loss'), |
- ('WebGLContextLostFromSelectElement', |
+ ('ContextLost_WebGLContextLostFromSelectElement', |
'webgl_with_select_element.html'), |
- ('WebGLContextLostInHiddenTab', |
+ ('ContextLost_WebGLContextLostInHiddenTab', |
'webgl.html?query=kill_after_notification')) |
for t in tests: |
yield (t[0], t[1], ('_' + t[0])) |
@@ -212,24 +212,25 @@ class ContextLostIntegrationTest(gpu_integration_test.GpuIntegrationTest): |
# given in GenerateGpuTests, so in order to hand-write our tests but |
# also go through the _RunGpuTest trampoline, the test needs to be |
# slightly differently named. |
- def _GPUProcessCrashesExactlyOncePerVisitToAboutGpuCrash(self, test_path): |
+ def _GpuCrash_GPUProcessCrashesExactlyOncePerVisitToAboutGpuCrash( |
+ self, test_path): |
self._NavigateAndWaitForLoad(test_path) |
self._KillGPUProcess(2, True) |
self._RestartBrowser('must restart after tests that kill the GPU process') |
- def _WebGLContextLostFromGPUProcessExit(self, test_path): |
+ def _ContextLost_WebGLContextLostFromGPUProcessExit(self, test_path): |
self._NavigateAndWaitForLoad(test_path) |
self._KillGPUProcess(1, False) |
self._RestartBrowser('must restart after tests that kill the GPU process') |
- def _WebGLContextLostFromLoseContextExtension(self, test_path): |
+ def _ContextLost_WebGLContextLostFromLoseContextExtension(self, test_path): |
url = self.UrlOfStaticFilePath(test_path) |
tab = self.tab |
tab.Navigate(url, script_to_evaluate_on_commit=harness_script) |
tab.action_runner.WaitForJavaScriptCondition( |
'window.domAutomationController._finished') |
- def _WebGLContextLostFromQuantity(self, test_path): |
+ def _ContextLost_WebGLContextLostFromQuantity(self, test_path): |
self._NavigateAndWaitForLoad(test_path) |
# Try to coerce GC to clean up any contexts not attached to the page. |
# This method seems unreliable, so the page will also attempt to |
@@ -237,11 +238,11 @@ class ContextLostIntegrationTest(gpu_integration_test.GpuIntegrationTest): |
self.tab.CollectGarbage() |
self._WaitForTabAndCheckCompletion() |
- def _WebGLContextLostFromSelectElement(self, test_path): |
+ def _ContextLost_WebGLContextLostFromSelectElement(self, test_path): |
self._NavigateAndWaitForLoad(test_path) |
self._WaitForTabAndCheckCompletion() |
- def _WebGLContextLostInHiddenTab(self, test_path): |
+ def _ContextLost_WebGLContextLostInHiddenTab(self, test_path): |
self._NavigateAndWaitForLoad(test_path) |
# Test losing a context in a hidden tab. This test passes if the tab |
# doesn't crash. |