Index: content/test/gpu/gpu_tests/gpu_integration_test.py |
diff --git a/content/test/gpu/gpu_tests/gpu_integration_test.py b/content/test/gpu/gpu_tests/gpu_integration_test.py |
index 9bdc7afcb3c3f585b1fc35fa4d78c83b5456718a..908c8164f28729e9d282c1431211fcfb9b166d77 100644 |
--- a/content/test/gpu/gpu_tests/gpu_integration_test.py |
+++ b/content/test/gpu/gpu_tests/gpu_integration_test.py |
@@ -23,15 +23,18 @@ class GpuIntegrationTest( |
@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: |