Remove webkitpy/common/config/urls.py

third_party/WebKit/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py

 # Copyright (C) 2012 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 19 matching lines @@
 
 import os
 import json
 import logging
 import optparse
 import time
 import datetime
 
 from webkitpy.common import find_files
 from webkitpy.common.checkout.scm.detection import SCMDetector
-from webkitpy.common.config.urls import view_source_url
 from webkitpy.common.host import Host
 from webkitpy.common.net.file_uploader import FileUploader
 from webkitpy.performance_tests.perftest import PerfTestFactory
 from webkitpy.performance_tests.perftest import DEFAULT_TEST_RUNNER_COUNT
 
 
 _log = logging.getLogger(__name__)
 
 
 class PerfTestsRunner(object):
@@ skipping 236 matching lines @@
 
         for test, metrics in self._results:
             for metric_name, iteration_values in metrics.iteritems():
                 if not isinstance(iteration_values, list):  # We can't reports results without individual measurements.
                     continue
 
                 tests = contents['tests']
                 path = test.test_name_without_file_extension().split('/')
                 for i in range(0, len(path)):
                     is_last_token = i + 1 == len(path)
-                    url = view_source_url('PerformanceTests/' + (test.test_name() if is_last_token else '/'.join(path[0:i + 1])))
+                    url = self.view_source_url(
+                        'PerformanceTests/' + (test.test_name() if is_last_token else '/'.join(path[0:i + 1])))
                     tests.setdefault(path[i], {'url': url})
                     current_test = tests[path[i]]
                     if is_last_token:
                         current_test.setdefault('metrics', {})
                         assert metric_name not in current_test['metrics']
                         current_test['metrics'][metric_name] = {'current': iteration_values}
                     else:
                         current_test.setdefault('tests', {})
                         tests = current_test['tests']
 
         return contents
 
     @staticmethod
+    def view_source_url(path_from_blink):
+        return "https://src.chromium.org/viewvc/blink/trunk/%s" % path_from_blink

[qyearsley, 2016/08/03 18:13:53]

Also, it seems likely that this should be updated to
"https://chromium.googlesource.com/chromium/src/+/master/third_party/WebKit/%s".
OK to do this in this CL, or should this be done in a separate CL?

[Dirk Pranke, 2016/08/09 00:05:15]

whichever you like. I'd probably do it in this CL.

[qyearsley, 2016/08/09 17:22:10]

Done

+
+    @staticmethod
     def _datetime_in_ES5_compatible_iso_format(datetime):
         return datetime.strftime('%Y-%m-%dT%H:%M:%S.%f')
 
     def _merge_slave_config_json(self, slave_config_json_path, contents):
         if not self._host.filesystem.isfile(slave_config_json_path):
             _log.error("Missing slave configuration JSON file: %s", slave_config_json_path)
             return None
 
         try:
             slave_config_json = self._host.filesystem.open_text_file_for_reading(slave_config_json_path)
@@ skipping 52 matching lines @@
             if metrics:
                 self._results.append((test, metrics))
             else:
                 failures += 1
                 _log.error('FAILED')
 
             _log.info('Finished: %f s', time.time() - start_time)
             _log.info('')
 
         return failures