Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1489)

Side by Side Diff: scripts/slave/recipe_modules/chromium_tests/api.py

Issue 2391353002: Revert of Updating the SwarmingIsolatedScriptTest to upload chartjson results to the (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | scripts/slave/recipe_modules/chromium_tests/steps.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import collections 5 import collections
6 import contextlib 6 import contextlib
7 import copy 7 import copy
8 import itertools 8 import itertools
9 import json 9 import json
10 10
(...skipping 779 matching lines...) Expand 10 before | Expand all | Expand 10 after
790 # TODO(phajdan.jr): Remove buildnumber when no longer used. 790 # TODO(phajdan.jr): Remove buildnumber when no longer used.
791 791
792 mastername = self.m.properties.get('mastername') 792 mastername = self.m.properties.get('mastername')
793 buildername = self.m.properties.get('buildername') 793 buildername = self.m.properties.get('buildername')
794 master_dict = self.builders.get(mastername, {}) 794 master_dict = self.builders.get(mastername, {})
795 bot_config = master_dict.get('builders', {}).get(buildername, {}) 795 bot_config = master_dict.get('builders', {}).get(buildername, {})
796 796
797 for name in ('buildername', 'slavename', 'buildnumber', 'mastername'): 797 for name in ('buildername', 'slavename', 'buildnumber', 'mastername'):
798 properties[name] = self.m.properties[name] 798 properties[name] = self.m.properties[name]
799 799
800 # Optional properties 800 # Optional properties
801 for name in ('perf-id', 'results-url'): 801 for name in ('perf-id', 'results-url'):
802 if bot_config.get(name): 802 if bot_config.get(name):
803 properties[name] = bot_config[name] 803 properties[name] = bot_config[name]
804 804
805 properties['target_platform'] = self.m.chromium.c.TARGET_PLATFORM 805 properties['target_platform'] = self.m.chromium.c.TARGET_PLATFORM
806 806
807 args.extend(['--properties', self.m.json.input(properties)]) 807 args.extend(['--properties', self.m.json.input(properties)])
808 808
809 return args 809 return args
810 810
811 def get_compile_targets_for_scripts(self): 811 def get_compile_targets_for_scripts(self):
812 return self.m.python( 812 return self.m.python(
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
1016 targets in |compile_targets|.""" 1016 targets in |compile_targets|."""
1017 result = [] 1017 result = []
1018 for test in tests: 1018 for test in tests:
1019 test_compile_targets = test.compile_targets(api) 1019 test_compile_targets = test.compile_targets(api)
1020 # Always return tests that don't require compile. Otherwise we'd never 1020 # Always return tests that don't require compile. Otherwise we'd never
1021 # run them. 1021 # run them.
1022 if ((set(compile_targets) & set(test_compile_targets)) or 1022 if ((set(compile_targets) & set(test_compile_targets)) or
1023 not test_compile_targets): 1023 not test_compile_targets):
1024 result.append(test) 1024 result.append(test)
1025 return result 1025 return result
OLDNEW
« no previous file with comments | « no previous file | scripts/slave/recipe_modules/chromium_tests/steps.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698