Enable loading.desktop benchmark with network service enabled on perf fyi bot.

tools/perf/core/perf_data_generator.py

 #!/usr/bin/env python
 # Copyright 2016 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.
 
 # pylint: disable=too-many-lines
 
 """Script to generate chromium.perf.json and chromium.perf.fyi.json in
 the src/testing/buildbot directory and benchmark.csv in the src/tools/perf
 directory. Maintaining these files by hand is too unwieldy.
@@ skipping 835 matching lines @@
   return tests
 
 
 def get_json_config_file_for_waterfall(waterfall):
   filename = '%s.json' % waterfall['name']
   buildbot_dir = os.path.join(
       path_util.GetChromiumSrcDir(), 'testing', 'buildbot')
   return os.path.join(buildbot_dir, filename)
 
 
+def get_extras_json_config_file_for_waterfall(waterfall):
+  filename = '%s.extras.json' % waterfall['name']
+  buildbot_dir = os.path.join(path_util.GetChromiumSrcDir(), 'tools', 'perf')
+  return os.path.join(buildbot_dir, filename)
+
+
+def append_extra_tests(waterfall, tests):

[martiniss, 2017/07/06 22:11:22]

Can you add a small docstring here?

[yzshen1, 2017/07/07 18:02:44]

Done.

+  extra_config_file = get_extras_json_config_file_for_waterfall(waterfall)
+  if os.path.isfile(extra_config_file):
+    with open(extra_config_file) as extra_fp:
+      extra_tests = json.load(extra_fp)
+      for key, value in extra_tests.iteritems():
+        assert key not in tests
+        tests[key] = value
+
+
 def tests_are_up_to_date(waterfalls):
   up_to_date = True
   all_tests = {}
   for w in waterfalls:
     tests = generate_all_tests(w)
+    # Note: |all_tests| don't cover those manually-specified tests added by
+    # append_extra_tests().
+    all_tests.update(tests)
+    append_extra_tests(w, tests)
     tests_data = json.dumps(tests, indent=2, separators=(',', ': '),
                             sort_keys=True)
     config_file = get_json_config_file_for_waterfall(w)
     with open(config_file, 'r') as fp:
       config_data = fp.read().strip()
-    all_tests.update(tests)
     up_to_date &= tests_data == config_data
   verify_all_tests_in_benchmark_csv(all_tests,
                                     get_all_waterfall_benchmarks_metadata())
   return up_to_date
 
 
 def update_all_tests(waterfalls):
   all_tests = {}
   for w in waterfalls:
     tests = generate_all_tests(w)
+    # Note: |all_tests| don't cover those manually-specified tests added by
+    # append_extra_tests().
+    all_tests.update(tests)
+    append_extra_tests(w, tests)
     config_file = get_json_config_file_for_waterfall(w)
     with open(config_file, 'w') as fp:
       json.dump(tests, fp, indent=2, separators=(',', ': '), sort_keys=True)
       fp.write('\n')
-    all_tests.update(tests)
   verify_all_tests_in_benchmark_csv(all_tests,
                                     get_all_waterfall_benchmarks_metadata())
 
 
 # not_scheduled means this test is not scheduled on any of the chromium.perf
 # waterfalls. Right now, all the below benchmarks are scheduled, but some other
 # benchmarks are not scheduled, because they're disabled on all platforms.
 BenchmarkMetadata = collections.namedtuple(
     'BenchmarkMetadata', 'emails component not_scheduled')
 NON_TELEMETRY_BENCHMARKS = {
@@ skipping 160 matching lines @@
       return 0
     else:
       print ('The perf JSON config files are not up-to-date. Please run %s '
              'without --validate-only flag to update the perf JSON '
              'configs and benchmark.csv.') % sys.argv[0]
       return 1
   else:
     update_all_tests([fyi_waterfall, waterfall])
     update_benchmark_csv()
   return 0