[web_tests][resultdb] replace testLocation by testMetadata

testLocation has been moved to testMetadata.
- https://source.chromium.org/chromium/infra/infra/+/master:go/src/go.chromium.org/luci/resultdb/sink/proto/v1/test_result.proto;l=61-66
- https://source.chromium.org/chromium/infra/infra/+/master:go/src/go.chromium.org/luci/resultdb/proto/v1/test_metadata.proto;l=32-50

R=chanli@chromium.org,robertma@chromium.org
CC=nodir@chromium.org

Bug: 1137513
Change-Id: I9ab4cf8a4a5117c7d18cb3eae71a61da59715413
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2532912
Commit-Queue: Scott Lee <ddoman@chromium.org>
Reviewed-by: Chan Li <chanli@chromium.org>
Reviewed-by: Robert Ma <robertma@chromium.org>
Cr-Commit-Position: refs/heads/master@{#827315}

third_party/blink/tools/blinkpy/web_tests/controllers/test_result_sink.py

@@ -17,6 +17,7 @@ import json
 import logging
 import requests
 
+from blinkpy.common.path_finder import RELATIVE_WEB_TESTS
 from blinkpy.web_tests.models.typ_types import ResultType
 
 _log = logging.getLogger(__name__)
@@ -165,6 +166,7 @@ class TestResultSink(object):
 
         # The structure and member definitions of this dict can be found at
         # https://chromium.googlesource.com/infra/luci/luci-go/+/refs/heads/master/resultdb/proto/sink/v1/test_result.proto
+        locFileName = '//%s%s' % (RELATIVE_WEB_TESTS, result.test_name)
         r = {
             'artifacts': self._artifacts(result),
             'duration': '%ss' % result.total_run_time,
@@ -176,13 +178,17 @@ class TestResultSink(object):
             # 'startTime': result.start_time
             'tags': self._tags(result),
             'testId': result.test_name,
-
-            # testLocation is where the test is defined. It is used to find
-            # the associated component/team/os information in flakiness and
-            # disabled-test dashboards.
-            'testLocation': {
-                'fileName':
-                '//third_party/blink/web_tests/' + result.test_name,
+            'testMetadata': {
+                'name': result.test_name,
+
+                # location is where the test is defined. It is used to find
+                # the associated component/team/os information in flakiness
+                # and disabled-test dashboards.
+                'location': {
+                    'repo': 'https://chromium.googlesource.com/chromium/src',
+                    'fileName': locFileName,
+                    # skip: 'line'
+                },
             },
         }
         self._send({'testResults': [r]})

third_party/blink/tools/blinkpy/web_tests/controllers/test_result_sink_unittest.py

@@ -11,6 +11,7 @@ import unittest
 from urlparse import urlparse
 
 from blinkpy.common.host_mock import MockHost
+from blinkpy.common.path_finder import RELATIVE_WEB_TESTS
 from blinkpy.web_tests.controllers.test_result_sink import CreateTestResultSink
 from blinkpy.web_tests.controllers.test_result_sink import TestResultSink
 from blinkpy.web_tests.models import test_results
@@ -94,15 +95,33 @@ class TestResultSinkMessage(TestResultSinkTestBase):
         self.assertEqual(sent_data['status'], 'CRASH')
         self.assertEqual(sent_data['duration'], '123.456s')
 
-    def test_test_location(self):
+    def test_test_metadata(self):
         tr = test_results.TestResult('')
-        prefix = '//third_party/blink/web_tests/'
-        sink = lambda tr: self.sink(True, tr)['testLocation']['fileName']
+        base_path = '//' + RELATIVE_WEB_TESTS
 
         tr.test_name = "test-name"
-        self.assertEqual(sink(tr), prefix + 'test-name')
+        self.assertDictEqual(
+            self.sink(True, tr)['testMetadata'],
+            {
+                'name': 'test-name',
+                'location': {
+                    'repo': 'https://chromium.googlesource.com/chromium/src',
+                    'fileName': base_path + 'test-name',
+                },
+            },
+        )
+
         tr.test_name = "///test-name"
-        self.assertEqual(sink(tr), prefix + '///test-name')
+        self.assertDictEqual(
+            self.sink(True, tr)['testMetadata'],
+            {
+                'name': '///test-name',
+                'location': {
+                    'repo': 'https://chromium.googlesource.com/chromium/src',
+                    'fileName': base_path + '///test-name',
+                },
+            },
+        )
 
     def test_device_failure(self):
         tr = test_results.TestResult(test_name='test-name')