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

Unified Diff: scripts/slave/recipe_modules/chromium_tests/steps.py

Issue 2131993003: android: use common known_devices_file path from chromium_android (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 4 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « scripts/slave/recipe_modules/chromium_tests/chromium_perf.py ('k') | scripts/slave/recipes/android/perf.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipe_modules/chromium_tests/steps.py
diff --git a/scripts/slave/recipe_modules/chromium_tests/steps.py b/scripts/slave/recipe_modules/chromium_tests/steps.py
index 937c0d050c4efd27e15fe744bd99c6685a7d8750..d7f2401ab31ce1787f60d5680c6f251ee23e7aad 100644
--- a/scripts/slave/recipe_modules/chromium_tests/steps.py
+++ b/scripts/slave/recipe_modules/chromium_tests/steps.py
@@ -534,7 +534,7 @@ def generate_script(api, chromium_tests_api, mastername, buildername, test_spec,
class DynamicPerfTests(Test):
def __init__(self, perf_id, platform, target_bits, max_battery_temp=None,
num_device_shards=1, num_host_shards=1, shard_index=0,
- known_devices_file=None, override_browser_name=None):
+ override_browser_name=None):
self._perf_id = perf_id
self._platform = platform
self._target_bits = target_bits
@@ -543,7 +543,6 @@ class DynamicPerfTests(Test):
self._num_host_shards = num_host_shards
self._num_device_shards = num_device_shards
self._shard_index = shard_index
- self._known_devices_file = known_devices_file
if override_browser_name:
self._browser_name = override_browser_name
@@ -591,16 +590,12 @@ class DynamicPerfTests(Test):
return tests
def _run_sharded(self, api, tests):
- known_devices_file = (
- api.path['build'].join(
- 'site_config', self._known_devices_file) if self._known_devices_file
- else None)
api.chromium_android.run_sharded_perf_tests(
config=api.json.input(data=tests),
perf_id=self._perf_id,
chartjson_file=True,
max_battery_temp=self._max_battery_temp,
- known_devices_file=known_devices_file)
+ known_devices_file=api.chromium_android.known_devices_file)
def _run_serially(self, api, tests):
failure = None
« no previous file with comments | « scripts/slave/recipe_modules/chromium_tests/chromium_perf.py ('k') | scripts/slave/recipes/android/perf.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698