Refactor layout test scripts to get the dashboard work for other types

webkit/tools/layout_tests/run_webkit_tests.py

 #!/usr/bin/env python
 # Copyright (c) 2006-2009 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.
 
 """Run layout tests using the test_shell.
 
 This is a port of the existing webkit test script run-webkit-tests.
 
 The TestRunner class runs a series of tests (TestType interface) against a set
@@ skipping 20 matching lines @@
 import re
 import shutil
 import subprocess
 import sys
 import time
 import traceback
 
 from layout_package import apache_http_server
 from layout_package import test_expectations
 from layout_package import http_server
-from layout_package import json_results_generator
+from layout_package import json_layout_results_generator
 from layout_package import metered_stream
 from layout_package import path_utils
 from layout_package import platform_utils
 from layout_package import test_failures
 from layout_package import test_shell_thread
 from layout_package import test_files
 from layout_package import websocket_server
 from test_types import fuzzy_image_diff
 from test_types import image_diff
 from test_types import test_type_base
 from test_types import text_diff
 
 sys.path.append(path_utils.PathFromBase('third_party'))
 import simplejson
 
 # Indicates that we want detailed progress updates in the output (prints
 # directory-by-directory feedback).
 LOG_DETAILED_PROGRESS = 'detailed-progress'
 
 # Log any unexpected results while running (instead of just at the end).
 LOG_UNEXPECTED = 'unexpected'
 
+# Builder base URL where we have the archived test results.
+BUILDER_BASE_URL = "http://build.chromium.org/buildbot/layout_test_results/"
+
 TestExpectationsFile = test_expectations.TestExpectationsFile
 
 class TestInfo:
   """Groups information about a test for easy passing of data."""
   def __init__(self, filename, timeout):
     """Generates the URI and stores the filename and timeout for this test.
     Args:
       filename: Full path to the test.
       timeout: Timeout for running the test in TestShell.
       """
@@ skipping 48 matching lines @@
     if len(failures):
       self.failures[test] = failures
     if expected:
       self.expected += 1
     else:
       self.unexpected_results[test] = result
       self.unexpected += 1
 
 
 class TestRunner:
-  """A class for managing running a series of tests on a series of test
+  """A class for managing running a series of tests on a series of layout test
   files."""
 
   HTTP_SUBDIR = os.sep.join(['', 'http', ''])
   WEBSOCKET_SUBDIR = os.sep.join(['', 'websocket', ''])
 
   # The per-test timeout in milliseconds, if no --time-out-ms option was given
   # to run_webkit_tests. This should correspond to the default timeout in
   # test_shell.exe.
   DEFAULT_TEST_TIMEOUT_MS = 6 * 1000
 
@@ skipping 734 matching lines @@
     unexpected_file.close()
 
     # Write a json file of the test_expectations.txt file for the layout tests
     # dashboard.
     expectations_file = open(os.path.join(self._options.results_directory,
         "expectations.json"), "w")
     expectations_json = self._expectations.GetExpectationsJsonForAllPlatforms()
     expectations_file.write(("ADD_EXPECTATIONS(" + expectations_json + ");"))
     expectations_file.close()
 
-    json_results_generator.JSONResultsGenerator(self._options,
-        self._expectations, result_summary, individual_test_timings,
-        self._options.results_directory, self._test_files_list)
+    json_layout_results_generator.JSONLayoutResultsGenerator(
+        self._options.builder_name, self._options.build_name,
+        self._options.build_number, self._options.results_directory,
+        BUILDER_BASE_URL, individual_test_timings,
+        self._expectations, result_summary, self._test_files_list)
 
     logging.debug("Finished writing JSON files.")
 
   def _PrintExpectedResultsOfType(self, write, result_summary, result_type,
       result_type_str):
     """Print the number of the tests in a given result class.
 
     Args:
       write: A callback to write info to (e.g., a LoggingWriter) or
          sys.stdout.write.
@@ skipping 693 matching lines @@
   option_parser.add_option("", "--build-number",
                            default="DUMMY_BUILD_NUMBER",
                            help=("The build number of the builder running"
                                  "this script."))
   option_parser.add_option("", "--experimental-fully-parallel",
                            action="store_true", default=False,
                            help="run all tests in parallel")
 
   options, args = option_parser.parse_args()
   main(options, args)