Use chromium revision instead of blink svn revision when rebaselining layout tests.

third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_run_results.py

Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_run_results.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_run_results.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_run_results.py
index 5f8151e777c0a203fa2a27c57bc55514a31b36c2..672a6b00e424117a38b11f751459a8c724c268da 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_run_results.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_run_results.py
@@ -166,14 +166,6 @@ def _interpret_test_failures(failures):
     return test_dict
 
 
-def _chromium_commit_position(scm, path):
-    log = scm.most_recent_log_matching('Cr-Commit-Position:', path)
-    match = re.search('^\s*Cr-Commit-Position:.*@\{#(?P<commit_position>\d+)\}', log, re.MULTILINE)
-    if not match:
-        return ""
-    return str(match.group('commit_position'))
-
-
 def summarize_results(port_obj, expectations, initial_results,
                       all_retry_results, enabled_pixel_tests_in_retry,
                       only_include_failing=False):
@@ -341,20 +333,15 @@ def summarize_results(port_obj, expectations, initial_results,
     # 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'] = ''
     if port_obj.get_option('builder_name'):
         for (name, path) in port_obj.repository_paths():

[Dirk Pranke, 2015/09/29 17:39:23]

I think this line means that we'll end up calling scm.chromium_revision() twice
now.

Can you change repository_paths() to be up to date as part of this patch?

[joelo, 2015/09/30 09:46:32]

Good point. Done.

             scm = port_obj.host.scm_for_path(path)
             if scm:
-                if name.lower() == 'chromium':
-                    rev = _chromium_commit_position(scm, path)
-                else:
-                    rev = scm.svn_revision(path)
+                rev = scm.chromium_revision(path)
             if rev:
-                results[name.lower() + '_revision'] = rev
+                results['chromium_revision'] = rev

[ojan, 2015/09/29 21:31:54]

The old version of this code was correct. You should either:

1. get rid of the support for multiple repositories (i.e. instead of
repository_paths on port, you'd have repository_path)

or

2. Leave this using name.lower().

Up to you which one you do. #1 would require modifying perftestrunner.py as
well.

[joelo, 2015/09/30 09:46:32]

Done. Went with #1, less confusing since we no longer have a blink repo.

             else:
-                _log.warn('Failed to determine svn revision for %s, '
-                          'leaving "%s_revision" key blank in full_results.json.'
-                          % (path, name))
+                _log.warn('Failed to determine chromium revision, leaving '
+                          '"chromium_revision" key blank in full_results.json.')
 
     return results