Merge 283085 "Added more detailed result codes for CreateViewCom..."

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 105 matching lines @@
       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?)')
+    else:
+      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')
+      if not tab.EvaluateJavaScript(
+        'window.domAutomationController._succeeded'):
+        raise page_test.Failure('Test failed')
 
 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,
       name='ContextLost.WebGLContextLostFromGPUProcessExit')
     self.script_to_evaluate_on_commit = harness_script
     self.kill_gpu_process = True
@@ skipping 31 matching lines @@
       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.NavigateToPage(self)
     action_runner.WaitForJavaScriptCondition(
         'window.domAutomationController._loaded')
 
+class WebGLContextLostFromSelectElementPage(page.Page):
+  def __init__(self, page_set, base_dir):
+    super(WebGLContextLostFromSelectElementPage, self).__init__(
+      url='file://webgl_with_select_element.html',
+      page_set=page_set,
+      base_dir=base_dir,
+      name='ContextLost.WebGLContextLostFromSelectElement')
+    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.NavigateToPage(self)
+    action_runner.WaitForJavaScriptCondition(
+        '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,
       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))
+    ps.AddPage(WebGLContextLostFromSelectElementPage(ps, ps.base_dir))
     return ps