Roll out framework change & update gpu tests to conform to the API changes

content/test/gpu/gpu_tests/gpu_integration_test_unittest.py

Index: content/test/gpu/gpu_tests/gpu_integration_test_unittest.py
diff --git a/content/test/gpu/gpu_tests/gpu_integration_test_unittest.py b/content/test/gpu/gpu_tests/gpu_integration_test_unittest.py
index 49462559374651b17e4cfad87a852e783c95c6a5..2c924f6627a7a05306431919ec23d655673ba4d9 100644
--- a/content/test/gpu/gpu_tests/gpu_integration_test_unittest.py
+++ b/content/test/gpu/gpu_tests/gpu_integration_test_unittest.py
@@ -3,240 +3,104 @@
 # found in the LICENSE file.
 
 import json
-import logging
-import mock
 import os
+import shutil
 import tempfile
 import unittest
 
-from telemetry.testing import fakes
 from telemetry.testing import browser_test_runner
 
-import gpu_project_config
+from gpu_tests import path_util
 
-from gpu_tests import gpu_integration_test
-from gpu_tests import gpu_test_expectations
+path_util.AddDirToPathIfNeeded(path_util.GetChromiumSrcDir(), 'tools', 'perf')
+from chrome_telemetry_build import chromium_config
 
-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
-
-  @classmethod
-  def Name(cls):
-    return 'simple_integration_unittest'
 
+class GpuIntegrationTestUnittest(unittest.TestCase):
   def setUp(self):
-    super(SimpleIntegrationUnittest, self).setUp()
-
-  @classmethod
-  def setUpClass(cls):
-    finder_options = fakes.CreateBrowserFinderOptions()
-    finder_options.browser_options.platform = fakes.FakeLinuxPlatform()
-    finder_options.output_formats = ['none']
-    finder_options.suppress_gtest_report = True
-    finder_options.output_dir = None
-    finder_options.upload_bucket = 'public'
-    finder_options.upload_results = False
-    cls._finder_options = finder_options
-    cls.platform = None
-    cls.browser = None
-    cls.SetBrowserOptions(cls._finder_options)
-    cls.StartBrowser()
-
-  @classmethod
-  def GenerateGpuTests(cls, options):
-    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', ())
-
-  @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
-
-  def RunActualGpuTest(self, file_path, *args):
-    logging.warn('Running ' + file_path)
-    if file_path == 'failure.html':
-      self.fail('Expected 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 BrowserStartFailureIntegrationUnittest(
-  gpu_integration_test.GpuIntegrationTest):
-
-  _num_browser_crashes = 0
-  _num_browser_starts = 0
-
-  @classmethod
-  def setUpClass(cls):
-    cls._fake_browser_options = \
-        fakes.CreateBrowserFinderOptions(execute_on_startup=cls.CrashOnStart)
-    cls._fake_browser_options.browser_options.platform = \
-        fakes.FakeLinuxPlatform()
-    cls._fake_browser_options.output_formats = ['none']
-    cls._fake_browser_options.suppress_gtest_report = True
-    cls._fake_browser_options.output_dir = None
-    cls._fake_browser_options .upload_bucket = 'public'
-    cls._fake_browser_options .upload_results = False
-    cls._finder_options = cls._fake_browser_options
-    cls.platform = None
-    cls.browser = None
-    cls.SetBrowserOptions(cls._finder_options)
-    cls.StartBrowser()
-
-  @classmethod
-  def _CreateExpectations(cls):
-    return gpu_test_expectations.GpuTestExpectations()
-
-  @classmethod
-  def CrashOnStart(cls):
-    cls._num_browser_starts += 1
-    if cls._num_browser_crashes < 2:
-      cls._num_browser_crashes += 1
-      raise
-
-  @classmethod
-  def Name(cls):
-    return 'browser_start_failure_integration_unittest'
-
-  @classmethod
-  def GenerateGpuTests(cls, options):
-    # This test causes the browser to try and restart the browser 3 times.
-    yield ('restart', 'restart.html', ())
+    self._test_state = {}
 
-  def RunActualGpuTest(self, file_path, *args):
-    # The logic of this test is run when the browser starts, it fails twice
-    # and then succeeds on the third time so we are just testing that this
-    # is successful based on the parameters.
-    pass
-
-
-class BrowserCrashAfterStartIntegrationUnittest(
-  gpu_integration_test.GpuIntegrationTest):
-
-  _num_browser_crashes = 0
-  _num_browser_starts = 0
-
-  @classmethod
-  def setUpClass(cls):
-    cls._fake_browser_options = fakes.CreateBrowserFinderOptions(
-      execute_after_browser_creation=cls.CrashAfterStart)
-    cls._fake_browser_options.browser_options.platform = \
-        fakes.FakeLinuxPlatform()
-    cls._fake_browser_options.output_formats = ['none']
-    cls._fake_browser_options.suppress_gtest_report = True
-    cls._fake_browser_options.output_dir = None
-    cls._fake_browser_options .upload_bucket = 'public'
-    cls._fake_browser_options .upload_results = False
-    cls._finder_options = cls._fake_browser_options
-    cls.platform = None
-    cls.browser = None
-    cls.SetBrowserOptions(cls._finder_options)
-    cls.StartBrowser()
-
-  @classmethod
-  def _CreateExpectations(cls):
-    return gpu_test_expectations.GpuTestExpectations()
-
-  @classmethod
-  def CrashAfterStart(cls, browser):
-    cls._num_browser_starts += 1
-    if cls._num_browser_crashes < 2:
-      cls._num_browser_crashes += 1
-      # This simulates the first tab's renderer process crashing upon
-      # startup. The try/catch forces the GpuIntegrationTest's first
-      # fetch of this tab to fail. crbug.com/682819
-      try:
-        browser.tabs[0].Navigate('chrome://crash')
-      except Exception:
-        pass
-
-  @classmethod
-  def Name(cls):
-    return 'browser_crash_after_start_integration_unittest'
-
-  @classmethod
-  def GenerateGpuTests(cls, options):
-    # This test causes the browser to try and restart the browser 3 times.
-    yield ('restart', 'restart.html', ())
-
-  def RunActualGpuTest(self, file_path, *args):
-    # The logic of this test is run when the browser starts, it fails twice
-    # and then succeeds on the third time so we are just testing that this
-    # is successful based on the parameters.
-    pass
-
-
-class GpuIntegrationTestUnittest(unittest.TestCase):
-  @mock.patch('telemetry.internal.util.binary_manager.InitDependencyManager')
-  def testSimpleIntegrationUnittest(self, mockInitDependencyManager):
+  def testSimpleIntegrationTest(self):
     self._RunIntegrationTest(
-      'simple_integration_unittest', [
-        'unexpected_error',
-        'unexpected_failure'
-      ], [
-        'expected_failure',
-        'expected_flaky',
-      ])
+      'simple_integration_unittest',
+      ['unittest_data.integration_tests.SimpleTest.unexpected_error',
+       'unittest_data.integration_tests.SimpleTest.unexpected_failure'],
+      ['unittest_data.integration_tests.SimpleTest.expected_flaky',
+       'unittest_data.integration_tests.SimpleTest.expected_failure'],
+      ['unittest_data.integration_tests.SimpleTest.expected_skip'])
     # 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(self._test_state['num_browser_starts'], 6)
 
-  @mock.patch('telemetry.internal.util.binary_manager.InitDependencyManager')
-  def testIntegrationUnittestWithBrowserFailure(
-      self, mockInitDependencyManager):
+  def testIntegrationTesttWithBrowserFailure(self):
     self._RunIntegrationTest(
-      'browser_start_failure_integration_unittest', [], ['restart'])
-    self.assertEquals( \
-      BrowserStartFailureIntegrationUnittest._num_browser_crashes, 2)
-    self.assertEquals( \
-      BrowserStartFailureIntegrationUnittest._num_browser_starts, 3)
+      'browser_start_failure_integration_unittest', [],
+      ['unittest_data.integration_tests.BrowserStartFailureTest.restart'],
+      [])
+    self.assertEquals(self._test_state['num_browser_crashes'], 2)
+    self.assertEquals(self._test_state['num_browser_starts'], 3)
 
-  @mock.patch('telemetry.internal.util.binary_manager.InitDependencyManager')
-  def testIntegrationUnittestWithBrowserCrashUponStart(
-      self, mockInitDependencyManager):
+  def testIntegrationTestWithBrowserCrashUponStart(self):
     self._RunIntegrationTest(
-      'browser_crash_after_start_integration_unittest', [], ['restart'])
-    self.assertEquals( \
-      BrowserCrashAfterStartIntegrationUnittest._num_browser_crashes, 2)
-    self.assertEquals( \
-      BrowserCrashAfterStartIntegrationUnittest._num_browser_starts, 3)
-
-  def _RunIntegrationTest(self, test_name, failures, successes):
-    options = browser_test_runner.TestRunOptions()
-    # Suppress printing out information for passing tests.
-    options.verbosity = 0
-    config = gpu_project_config.CONFIG
-    temp_file = tempfile.NamedTemporaryFile(delete=False)
-    temp_file.close()
-    temp_file_name = temp_file.name
+      'browser_crash_after_start_integration_unittest', [],
+      [('unittest_data.integration_tests.BrowserCrashAfterStartTest.restart')],
+      [])
+    self.assertEquals(self._test_state['num_browser_crashes'], 2)
+    self.assertEquals(self._test_state['num_browser_starts'], 3)
+
+  def _RunIntegrationTest(self, test_name, failures, successes, skips):
+    config = chromium_config.ChromiumConfig(
+        top_level_dir=path_util.GetGpuTestDir(),
+        benchmark_dirs=[
+            os.path.join(path_util.GetGpuTestDir(), 'unittest_data')])
+    temp_dir = tempfile.mkdtemp()
+    test_results_path = os.path.join(temp_dir, 'test_results.json')
+    test_state_path = os.path.join(temp_dir, 'test_state.json')
     try:
       browser_test_runner.Run(
-          config, options,
+          config,
           [test_name,
-           '--write-abbreviated-json-results-to=%s' % temp_file_name])
-      with open(temp_file_name) as f:
+           '--write-full-results-to=%s' % test_results_path,
+           '--test-state-json-path=%s' % test_state_path])
+      with open(test_results_path) as f:
         test_result = json.load(f)
-      self.assertEquals(test_result['failures'], failures)
-      self.assertEquals(test_result['successes'], successes)
-      self.assertEquals(test_result['valid'], True)
-
+      with open(test_state_path) as f:
+        self._test_state = json.load(f)
+      actual_successes, actual_failures, actual_skips = (
+          self._ExtracTestResults(test_result))
+      self.assertEquals(actual_failures, failures)
+      self.assertEquals(actual_successes, successes)
+      self.assertEquals(actual_skips, skips)
     finally:
-      os.remove(temp_file_name)
+      shutil.rmtree(temp_dir)
+
+  def _ExtracTestResults(self, test_result):
+    delimiter = test_result['path_delimiter']
+    failures = []
+    successes = []
+    skips = []
+    def _IsLeafNode(node):
+      test_dict = node[1]
+      return ('expected' in test_dict and
+              isinstance(test_dict['expected'], basestring))
+    node_queues = []
+    for t in test_result['tests']:
+      node_queues.append((t, test_result['tests'][t]))
+    while node_queues:
+      node = node_queues.pop()
+      full_test_name, test_dict = node
+      if _IsLeafNode(node):
+        if all(res not in test_dict['expected'].split() for res in
+               test_dict['actual'].split()):
+          failures.append(full_test_name)
+        elif test_dict['expected'] == test_dict['actual'] == 'SKIP':
+          skips.append(full_test_name)
+        else:
+          successes.append(full_test_name)
+      else:
+        for k in test_dict:
+          node_queues.append(
+            ('%s%s%s' % (full_test_name, delimiter, k),
+             test_dict[k]))
+    return successes, failures, skips
+