Port Maps test to browser_test_runner harness.

content/test/gpu/generate_buildbot_json.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.
 
 """Script to generate chromium.gpu.json and chromium.gpu.fyi.json in
 the src/testing/buildbot directory. Maintaining these files by hand is
 too unwieldy.
 """
 
@@ skipping 1096 matching lines @@
        '--test-launcher-jobs=1',
        '--gtest_filter=CastStreamingApiTestWithPixelOutput.EndToEnd*:' + \
            'TabCaptureApiPixelTest.EndToEnd*'
      ],
      'swarming': {
        'can_use_on_swarming_builders': False,
      },
   }
 }
 
-TELEMETRY_TESTS = {
-  'maps_pixel_test': {
-    'target_name': 'maps',
-    'args': [
-      '--os-type',
-      '${os_type}',
-      '--build-revision',
-      '${got_revision}',
-      '--test-machine-name',
-      '${buildername}',
-    ],
-    'tester_configs': [
-      {
-        'allow_on_android': True,
-      },
-    ],
-  },
-}
-
-# These tests use Telemetry's new, simpler, browser_test_runner.
-# Eventually all of the Telemetry based tests above will be ported to
-# this harness, and the old harness will be deleted.
+# These tests use Telemetry's new browser_test_runner, which is a much
+# simpler harness for correctness testing.
 TELEMETRY_GPU_INTEGRATION_TESTS = {
   'context_lost': {
     'tester_configs': [
       {
         'allow_on_android': True,
       },
     ]
   },
   'depth_capture': {
     'tester_configs': [
@@ skipping 10 matching lines @@
         }
       ],
   },
   'hardware_accelerated_feature': {
     'tester_configs': [
       {
         'allow_on_android': True,
       },
     ],
   },
+  'maps_pixel_test': {
+    'target_name': 'maps',
+    'args': [
+      '--os-type',
+      '${os_type}',
+      '--build-revision',
+      '${got_revision}',
+      '--test-machine-name',
+      '${buildername}',
+    ],
+    'tester_configs': [
+      {
+        'allow_on_android': True,
+      },
+    ],
+  },
   'pixel_test': {
     'target_name': 'pixel',
     'args': [
       '--refimg-cloud-storage-bucket',
       'chromium-gpu-archive/reference-images',
       '--os-type',
       '${os_type}',
       '--build-revision',
       '${got_revision}',
       '--test-machine-name',
@@ skipping 334 matching lines @@
     result.pop('desktop_swarming')
 
   # This flag only has an effect on the Linux bots that run tests
   # locally (as opposed to via Swarming), which are only those couple
   # on the chromium.gpu.fyi waterfall. Still, there is no harm in
   # specifying it everywhere.
   result['use_xvfb'] = False
   return result
 
 def generate_telemetry_test(tester_name, tester_config,
-                            test, test_config, is_fyi,
-                            use_gpu_integration_test_harness):
+                            test, test_config, is_fyi):
   if not should_run_on_tester(tester_name, tester_config, test_config, is_fyi):
     return None
   test_args = ['-v']
   # --expose-gc allows the WebGL conformance tests to more reliably
   # reproduce GC-related bugs in the V8 bindings.
   extra_browser_args_string = (
       '--enable-logging=stderr --js-flags=--expose-gc')
   if 'extra_browser_args' in test_config:
     extra_browser_args_string += ' ' + ' '.join(
         test_config['extra_browser_args'])
@@ skipping 23 matching lines @@
   swarming = {
     # Always say this is true regardless of whether the tester
     # supports swarming. It doesn't hurt.
     'can_use_on_swarming_builders': True,
     'dimension_sets': tester_config['swarming_dimensions']
   }
   if 'swarming' in test_config:
     swarming.update(test_config['swarming'])
   result = {
     'args': prefix_args + test_args,
-    'isolate_name': (
-      'telemetry_gpu_integration_test' if use_gpu_integration_test_harness
-      else 'telemetry_gpu_test'),
+    'isolate_name': 'telemetry_gpu_integration_test',
     'name': step_name,
-    'override_compile_targets': [
-      ('telemetry_gpu_integration_test_run' if use_gpu_integration_test_harness
-       else 'telemetry_gpu_test_run')
-    ],
+    'override_compile_targets': ['telemetry_gpu_integration_test_run'],
     'swarming': swarming,
   }
   if 'non_precommit_args' in test_config:
     result['non_precommit_args'] = test_config['non_precommit_args']
   if 'precommit_args' in test_config:
     result['precommit_args'] = test_config['precommit_args']
   return result
 
 def generate_gtests(tester_name, tester_config, test_dictionary, is_fyi):
   # The relative ordering of some of the tests is important to
   # minimize differences compared to the handwritten JSON files, since
   # Python's sorts are stable and there are some tests with the same
   # key (see gles2_conform_d3d9_test and similar variants). Avoid
   # losing the order by avoiding coalescing the dictionaries into one.
   gtests = []
   for test_name, test_config in sorted(test_dictionary.iteritems()):
     test = generate_gtest(tester_name, tester_config,
                           test_name, test_config, is_fyi)
     if test:
       # generate_gtest may veto the test generation on this platform.
       gtests.append(test)
   return gtests
 
 def generate_telemetry_tests(tester_name, tester_config,
-                             test_dictionary, is_fyi,
-                             use_gpu_integration_test_harness):
+                             test_dictionary, is_fyi):
   isolated_scripts = []
   for test_name, test_config in sorted(test_dictionary.iteritems()):
     test = generate_telemetry_test(
-      tester_name, tester_config, test_name, test_config, is_fyi,
-      use_gpu_integration_test_harness)
+      tester_name, tester_config, test_name, test_config, is_fyi)
     if test:
       isolated_scripts.append(test)
   return isolated_scripts
 
 def generate_all_tests(waterfall, is_fyi):
   tests = {}
   for builder, config in waterfall['builders'].iteritems():
     tests[builder] = config
   for name, config in waterfall['testers'].iteritems():
     gtests = generate_gtests(name, config, COMMON_GTESTS, is_fyi)
     isolated_scripts = \
-      generate_telemetry_tests(name, config, TELEMETRY_TESTS, is_fyi, False) + \
-      generate_telemetry_tests(name, config, TELEMETRY_GPU_INTEGRATION_TESTS,
-                               is_fyi, True)
+      generate_telemetry_tests(
+        name, config, TELEMETRY_GPU_INTEGRATION_TESTS, is_fyi)
     tests[name] = {
       'gtest_tests': sorted(gtests, key=lambda x: x['test']),
       'isolated_scripts': sorted(isolated_scripts, key=lambda x: x['name'])
     }
   tests['AAAAA1 AUTOGENERATED FILE DO NOT EDIT'] = {}
   tests['AAAAA2 See generate_buildbot_json.py to make changes'] = {}
   filename = 'chromium.gpu.fyi.json' if is_fyi else 'chromium.gpu.json'
   with open(os.path.join(SRC_DIR, 'testing', 'buildbot', filename), 'wb') as fp:
     json.dump(tests, fp, indent=2, separators=(',', ': '), sort_keys=True)
     fp.write('\n')
 
 def main():
   generate_all_tests(FYI_WATERFALL, True)
   generate_all_tests(WATERFALL, False)
   return 0
 
 if __name__ == "__main__":
   sys.exit(main())