[content/test/gpu] Pushing the restart logic into start browser.

content/test/gpu/gpu_tests/gpu_integration_test.py

 # Copyright 2016 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 logging
 
 from telemetry.testing import serially_executed_browser_test_case
+from telemetry.util import screenshot
 
 from gpu_tests import exception_formatter
 from gpu_tests import gpu_test_expectations
 
 
 # Temporary class which bridges the gap beween these serially executed
 # browser tests and the old benchmark-based tests. As soon as all of
 # the tests have been coverted over, this will be deleted.
 class _EmulatedPage(object):
   def __init__(self, url, name):
     self.url = url
     self.name = name
 
 
 class GpuIntegrationTest(
     serially_executed_browser_test_case.SeriallyExecutedBrowserTestCase):
 
   _cached_expectations = None
 
   @classmethod
   def GenerateTestCases__RunGpuTest(cls, options):
     for test_name, url, args in cls.GenerateGpuTests(options):
       yield test_name, (url, test_name, args)
 
-  def _RestartBrowser(self, reason):
+  @classmethod
+  def StartBrowser(cls):
     for x in range(0, 3):
       try:
-        restart_attempt = ('Restarting browser %d time due to '
-          % (x + 1))
-        logging.warning(restart_attempt + reason)
-        self.StopBrowser()
-        self.SetBrowserOptions(self._finder_options)
-        self.StartBrowser()
-        self.tab = self.browser.tabs[0]
+        restart = 'Starting browser, attempt %d of 3' % (x + 1)
+        logging.warning(restart)
+        super(GpuIntegrationTest, cls).StartBrowser()
         return
       except Exception:
-        # If we are on the last try and there is an exception raise it
+        # If we are on the last try and there is an exception take a screenshot
+        # to try and capture more about the browser failure and raise
         if x == 2:
+          url = screenshot.TryCaptureScreenShotAndUploadToCloudStorage(
+            cls.platform)
+          if url is not None:
+            logging.info("GpuIntegrationTest screenshot of browser failure " +
+              "located at " + url)
+          else:
+            logging.warning("GpuIntegrationTest unable to take screenshot")
           raise
 
+  def _RestartBrowser(self, reason):
+    logging.warning('Restarting browser due to '+ reason)
+    self.StopBrowser()
+    self.SetBrowserOptions(self._finder_options)
+    self.StartBrowser()
+    self.tab = self.browser.tabs[0]
+
   def _RunGpuTest(self, url, test_name, args):
     temp_page = _EmulatedPage(url, test_name)
     expectations = self.__class__.GetExpectations()
     expectation = expectations.GetExpectationForPage(
       self.browser, temp_page)
     if expectation == 'skip':
       # skipTest in Python's unittest harness raises an exception, so
       # aborts the control flow here.
       self.skipTest('SKIPPING TEST due to test expectations')
     try:
@@ skipping 78 matching lines @@
 
   def setUp(self):
     try:
       self.tab = self.browser.tabs[0]
     except Exception:
       # restart the browser to make sure a failure in a test doesn't
       # propagate to the next test iteration.
       logging.exception("Failure during browser startup")
       self._RestartBrowser('failure in setup')
       raise