infra: add support for args and mixins in junit tests.
For use in crrev.com/c/1803434
Bug: 976218
Change-Id: Ia0a3cae9bf386a2d279b42b1e0aae622e90b0fda
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1809501
Reviewed-by: Stephen Martinis <[email protected]>
Commit-Queue: John Budorick <[email protected]>
Cr-Commit-Position: refs/heads/master@{#697391}
diff --git a/testing/buildbot/generate_buildbot_json.py b/testing/buildbot/generate_buildbot_json.py
index 49cfea3..50c2301 100755
--- a/testing/buildbot/generate_buildbot_json.py
+++ b/testing/buildbot/generate_buildbot_json.py
@@ -633,14 +633,17 @@
def generate_junit_test(self, waterfall, tester_name, tester_config,
test_name, test_config):
- del tester_config
if not self.should_run_on_tester(waterfall, tester_name, test_name,
test_config):
return None
- result = {
+ result = copy.deepcopy(test_config)
+ result.update({
'name': test_name,
'test': test_config.get('test', test_name),
- }
+ })
+ self.initialize_args_for_test(result, tester_config)
+ result = self.update_and_cleanup_test(
+ result, test_name, tester_name, tester_config, waterfall)
return result
def generate_instrumentation_test(self, waterfall, tester_name, tester_config,
