Clean up logging around browser relaunch in gpu_integration_test.py.

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
 
 
 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)
 
   @classmethod
   def StartBrowser(cls):
+    # We still need to retry the browser's launch even though
+    # desktop_browser_finder does so too, because it wasn't possible
+    # to push the fetch of the first tab into the lower retry loop
+    # without breaking Telemetry's unit tests, and that hook is used
+    # to implement the gpu_integration_test_unittests.
     for x in range(0, 3):
       try:
-        restart = 'Starting browser, attempt %d of 3' % (x + 1)
-        logging.warning(restart)
         super(GpuIntegrationTest, cls).StartBrowser()
         cls.tab = cls.browser.tabs[0]
-        logging.warning('Started browser successfully.')
         return
       except Exception:
+        logging.warning('Browser start failed (attempt %d of 3)', (x + 1))
         # 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")
@@ skipping 147 matching lines @@
       cls._RestartBrowser('failure in setup')
       raise
 
   def setUp(self):
     self._EnsureTabIsAvailable()
 
 def LoadAllTestsInModule(module):
   # Just delegates to serially_executed_browser_test_case to reduce the
   # number of imports in other files.
   return serially_executed_browser_test_case.LoadAllTestsInModule(module)