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

Unified Diff: telemetry/telemetry/internal/story_runner.py

Issue 2913383005: [Telemetry] Add temporary disabling of benchmark to story expectations. (Closed)
Patch Set: Created 3 years, 7 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 | « no previous file | telemetry/telemetry/internal/story_runner_unittest.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: telemetry/telemetry/internal/story_runner.py
diff --git a/telemetry/telemetry/internal/story_runner.py b/telemetry/telemetry/internal/story_runner.py
index ddc78d785f69d62cdc39db6bbdcf097e5f4a43b6..4f5aeaa7926794ad846805a8b7e7f5f420cbf3b0 100644
--- a/telemetry/telemetry/internal/story_runner.py
+++ b/telemetry/telemetry/internal/story_runner.py
@@ -324,11 +324,13 @@ def RunBenchmark(benchmark, finder_options):
'--browser=list' % finder_options.browser_options.browser_type)
return 1
- permanently_disabled = expectations.IsBenchmarkDisabled(
+ permanently_disabled = expectations.IsBenchmarkPermanentlyDisabled(
possible_browser.platform, finder_options)
# TODO(rnephew): Remove decorators.IsBenchmarkEnabled when deprecated.
- temporarily_disabled = not decorators.IsBenchmarkEnabled(
- benchmark, possible_browser)
+ temporarily_disabled = ((not decorators.IsBenchmarkEnabled(
+ benchmark, possible_browser)) or
+ expectations.IsBenchmarkTemporarilyDisabled(
+ possible_browser.platform, finder_options))
if permanently_disabled or temporarily_disabled:
print '%s is disabled on the selected browser' % benchmark.Name()
« no previous file with comments | « no previous file | telemetry/telemetry/internal/story_runner_unittest.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698