diff --git a/tools/webkitpy/layout_tests/layout_package/json_results_generator_unittest.py b/tools/webkitpy/layout_tests/layout_package/json_results_generator_unittest.py index fdb0a1a99f2..cb43f65da1d 100644 --- a/tools/webkitpy/layout_tests/layout_package/json_results_generator_unittest.py +++ b/tools/webkitpy/layout_tests/layout_package/json_results_generator_unittest.py @@ -35,7 +35,6 @@ from webkitpy.layout_tests.layout_package import json_results_generator class JSONGeneratorTest(unittest.TestCase): def setUp(self): self.builder_name = 'DUMMY_BUILDER_NAME' - self.build_name = 'DUMMY_BUILD_NAME' self.build_number = 'DUMMY_BUILDER_NUMBER' # For archived results. diff --git a/tools/webkitpy/layout_tests/models/test_run_results.py b/tools/webkitpy/layout_tests/models/test_run_results.py index cd0ed51f5ba..2d16fd0157b 100644 --- a/tools/webkitpy/layout_tests/models/test_run_results.py +++ b/tools/webkitpy/layout_tests/models/test_run_results.py @@ -311,17 +311,22 @@ def summarize_results(port_obj, expectations, initial_results, retry_results, en # Don't do this by default since it takes >100ms. # It's only used for uploading data to the flakiness dashboard. results['chromium_revision'] = '' - results['blink_revision'] = '' + # TODO(ojan): Clean this up now that we only have one revision field. + # And rename it to sky_revision (requires modifing test-results.appspot). if port_obj.get_option('builder_name'): for (name, path) in port_obj.repository_paths(): scm = port_obj.host.scm_for_path(path) if scm: - rev = scm.svn_revision(path) + rev = scm.latest_git_commit() if rev: results[name.lower() + '_revision'] = rev else: - _log.warn('Failed to determine svn revision for %s, ' + _log.warn('Failed to determine revision for %s, ' 'leaving "%s_revision" key blank in full_results.json.' % (path, name)) + # TODO(ojan): Change test-results.appspot to not require this field. + # test-results.appspot.com requires this field to be a number. :( + results['blink_revision'] = 0 + return results diff --git a/tools/webkitpy/layout_tests/run_webkit_tests.py b/tools/webkitpy/layout_tests/run_webkit_tests.py index 949a11c4fc5..7222580dcd5 100644 --- a/tools/webkitpy/layout_tests/run_webkit_tests.py +++ b/tools/webkitpy/layout_tests/run_webkit_tests.py @@ -281,9 +281,6 @@ def parse_args(args): optparse.make_option("--builder-name", default="", help=("The name of the builder shown on the waterfall running " "this script e.g. WebKit.")), - optparse.make_option("--build-name", default="DUMMY_BUILD_NAME", - help=("The name of the builder used in its path, e.g. " - "webkit-rel.")), optparse.make_option("--build-number", default="DUMMY_BUILD_NUMBER", help=("The build number of the builder running this script.")), optparse.make_option("--test-results-server", default="",