Adding 3 attempts at starting the browser for a gpu integration test.

content/test/gpu/gpu_tests/gpu_integration_test_unittest.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 json
 import mock
 import os
 import tempfile
 import unittest
 
 from telemetry.testing import fakes
 from telemetry.testing import browser_test_runner
 
 import gpu_project_config
 
 from gpu_tests import gpu_integration_test
 from gpu_tests import gpu_test_expectations
 
 _GLOBAL_TEST_COUNT = 0
+_GLOBAL_RESTART_CRASH = False
 
 class SimpleIntegrationUnittest(gpu_integration_test.GpuIntegrationTest):
   # Must be class-scoped since instances aren't reused across runs.
   _num_flaky_runs_to_fail = 2
 
   _num_browser_starts = 0
 
+  _num_restart_failures = 0
+
   @classmethod
   def Name(cls):
     return 'simple_integration_unittest'
 
   def setUp(self):
     global _GLOBAL_TEST_COUNT
     _GLOBAL_TEST_COUNT += 1
     # If this is the first test, fail on setup to ensure that the
     # gpu_integration_test handles failures in setup and remaining tests
     # can be executed
@@ skipping 17 matching lines @@
     cls.StartBrowser()
 
   @classmethod
   def GenerateGpuTests(cls, options):
     yield ('setup', 'failure.html', ())
     yield ('expected_failure', 'failure.html', ())
     yield ('expected_flaky', 'flaky.html', ())
     yield ('expected_skip', 'failure.html', ())
     yield ('unexpected_failure', 'failure.html', ())
     yield ('unexpected_error', 'error.html', ())
+    # This test causes the browser to restart 2 times (max allowed 3) and then
+    # succeeds on the third attempt
+    yield ('restart', 'restart.html', ())
 
   @classmethod
   def _CreateExpectations(cls):
     expectations = gpu_test_expectations.GpuTestExpectations()
     expectations.Fail('expected_failure')
     expectations.Flaky('expected_flaky', max_num_retries=3)
     expectations.Skip('expected_skip')
     return expectations
 
   @classmethod
   def StartBrowser(cls):
     super(SimpleIntegrationUnittest, cls).StartBrowser()
     cls._num_browser_starts += 1
 
+  @classmethod
+  def StopBrowser(cls):
+    global _GLOBAL_RESTART_CRASH
+    if _GLOBAL_RESTART_CRASH:
+      if cls._num_restart_failures < 2:
+        cls._num_restart_failures += 1
+        raise Exception
+      else:
+        _GLOBAL_RESTART_CRASH = False
+
+    super(SimpleIntegrationUnittest, cls).StopBrowser()
+
+
   def RunActualGpuTest(self, file_path, *args):
     if file_path == 'failure.html':
       self.fail('Expected failure')
+    elif file_path == 'restart.html':
+      global _GLOBAL_RESTART_CRASH
+      _GLOBAL_RESTART_CRASH = True
+      self._RestartBrowser("testing restart on failure")
     elif file_path == 'flaky.html':
       if self.__class__._num_flaky_runs_to_fail > 0:
         self.__class__._num_flaky_runs_to_fail -= 1
         self.fail('Expected flaky failure')
     elif file_path == 'error.html':
       raise Exception('Expected exception')
 
 
 class GpuIntegrationTestUnittest(unittest.TestCase):
   @mock.patch('telemetry.internal.util.binary_manager.InitDependencyManager')
@@ skipping 11 matching lines @@
           ['simple_integration_unittest',
            '--write-abbreviated-json-results-to=%s' % temp_file_name])
       with open(temp_file_name) as f:
         test_result = json.load(f)
       self.assertEquals(test_result['failures'], [
           'expected_failure',
           'setup',
           'unexpected_error',
           'unexpected_failure'])
       self.assertEquals(test_result['successes'], [
-          'expected_flaky'])
+          'expected_flaky', 'restart'])
       self.assertEquals(test_result['valid'], True)
       # It might be nice to be more precise about the order of operations
       # with these browser restarts, but this is at least a start.
-      self.assertEquals(SimpleIntegrationUnittest._num_browser_starts, 6)
+      self.assertEquals(SimpleIntegrationUnittest._num_browser_starts, 7)
+      # Assert that we restarted the browser 2 times due to failure in restart
+      self.assertEquals(SimpleIntegrationUnittest._num_restart_failures, 2)
     finally:
       os.remove(temp_file_name)