Added test to ensure context restoration due to GC doesn't crash (Take 2)

content/test/gpu/gpu_tests/context_lost.py

 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 import os
 
 from telemetry import test as test_module
 from telemetry.core import exceptions
 from telemetry.core import util
 from telemetry.page import page
 from telemetry.page import page_set
@@ skipping 84 matching lines @@
           new_tab.Close()
         except (exceptions.TabCrashException, Exception):
           print 'Tab crashed while closing chrome://gpucrash'
         if not completed:
           raise page_test.Failure(
               'Test didn\'t complete (no context lost event?)')
         if not tab.EvaluateJavaScript(
           'window.domAutomationController._succeeded'):
           raise page_test.Failure(
             'Test failed (context not restored properly?)')
+    elif page.force_garbage_collection:
+      # Try to corce GC to clean up any contexts not attached to the page.
+      # This method seem unreliable, so the page will also attempt to force
+      # GC through excessive allocations.
+      tab.CollectGarbage()
+      completed = False
+      try:
+        print "Waiting for page to finish."
+        util.WaitFor(lambda: tab.EvaluateJavaScript(
+            'window.domAutomationController._finished'), wait_timeout)
+        completed = True
+      except util.TimeoutException:
+        pass
+
+      if not completed:
+        raise page_test.Failure(
+            'Test didn\'t complete (no context restored event?)')
+      if not tab.EvaluateJavaScript(
+        'window.domAutomationController._succeeded'):
+        raise page_test.Failure(
+          'Test failed (context not restored properly?)')
 
 class WebGLContextLostFromGPUProcessExitPage(page.Page):
   def __init__(self, page_set, base_dir):
     super(WebGLContextLostFromGPUProcessExitPage, self).__init__(
       url='file://webgl.html?query=kill_after_notification',
       page_set=page_set,
       base_dir=base_dir)
     self.name = 'ContextLost.WebGLContextLostFromGPUProcessExit'
     self.script_to_evaluate_on_commit = harness_script
     self.kill_gpu_process = True
     self.number_of_gpu_process_kills = 1
+    self.force_garbage_collection = False
 
   def RunNavigateSteps(self, action_runner):
     action_runner.RunAction(NavigateAction())
     action_runner.RunAction(WaitAction(
       {'javascript': 'window.domAutomationController._loaded'}))
 
 
 class WebGLContextLostFromLoseContextExtensionPage(page.Page):
   def __init__(self, page_set, base_dir):
     super(WebGLContextLostFromLoseContextExtensionPage, self).__init__(
       url='file://webgl.html?query=WEBGL_lose_context',
       page_set=page_set,
       base_dir=base_dir)
     self.name = 'ContextLost.WebGLContextLostFromLoseContextExtension',
     self.script_to_evaluate_on_commit = harness_script
     self.kill_gpu_process = False
+    self.force_garbage_collection = False
 
   def RunNavigateSteps(self, action_runner):
     action_runner.RunAction(NavigateAction())
     action_runner.RunAction(WaitAction(
       {'javascript': 'window.domAutomationController._finished'}))
 
+class WebGLContextLostFromQuantityPage(page.Page):
+  def __init__(self, page_set, base_dir):
+    super(WebGLContextLostFromQuantityPage, self).__init__(
+      url='file://webgl.html?query=forced_quantity_loss',
+      page_set=page_set,
+      base_dir=base_dir)
+    self.name = 'ContextLost.WebGLContextLostFromQuantity',
+    self.script_to_evaluate_on_commit = harness_script
+    self.kill_gpu_process = False
+    self.force_garbage_collection = True
+
+  def RunNavigateSteps(self, action_runner):
+    action_runner.RunAction(NavigateAction())
+    action_runner.RunAction(WaitAction(
+      {'javascript': 'window.domAutomationController._loaded'}))
 
 class ContextLost(test_module.Test):
   enabled = True
   test = _ContextLostValidator
   # For the record, this would have been another way to get the pages
   # to repeat. pageset_repeat would be another option.
   # options = {'page_repeat': 5}
   def CreatePageSet(self, options):
     ps = page_set.PageSet(
       file_path=data_path,
       description='Test cases for real and synthetic context lost events',
       user_agent_type='desktop',
       serving_dirs=set(['']))
     ps.AddPage(WebGLContextLostFromGPUProcessExitPage(ps, ps.base_dir))
     ps.AddPage(WebGLContextLostFromLoseContextExtensionPage(ps, ps.base_dir))
+    ps.AddPage(WebGLContextLostFromQuantityPage(ps, ps.base_dir))
     return ps
+
+