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

Unified Diff: tools/perf/benchmarks/benchmark_smoke_unittest.py

Issue 2228413003: [tools/perf] Enable many more lint checks for perf directory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address Petr's comment Created 4 years, 4 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 | tools/perf/core/benchmark_finders_unittest.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/perf/benchmarks/benchmark_smoke_unittest.py
diff --git a/tools/perf/benchmarks/benchmark_smoke_unittest.py b/tools/perf/benchmarks/benchmark_smoke_unittest.py
index 29650aa5506ea6ae818a732ec1243aeb02c22c5f..51291c78f9c207d96805f6ddd92f275bcbf4e40b 100644
--- a/tools/perf/benchmarks/benchmark_smoke_unittest.py
+++ b/tools/perf/benchmarks/benchmark_smoke_unittest.py
@@ -98,6 +98,14 @@ _BLACK_LIST_TEST_MODULES = {
}
+def MergeDecorators(method, method_attribute, benchmark, benchmark_attribute):
+ # Do set union of attributes to eliminate duplicates.
+ merged_attributes = getattr(method, method_attribute, set()).union(
+ getattr(benchmark, benchmark_attribute, set()))
+ if merged_attributes:
+ setattr(method, method_attribute, merged_attributes)
+
+
def load_tests(loader, standard_tests, pattern):
del loader, standard_tests, pattern # unused
suite = progress_reporter.TestSuite()
@@ -147,16 +155,11 @@ def load_tests(loader, standard_tests, pattern):
disabled_method_attr = decorators.DisabledAttributeName(method)
enabled_benchmark_attr = decorators.EnabledAttributeName(benchmark)
enabled_method_attr = decorators.EnabledAttributeName(method)
- # Merge decorators.
- def MergeDecorators(method_attribute, benchmark_attribute):
- # Do set union of attributes to eliminate duplicates.
- merged_attributes = getattr(method, method_attribute, set()).union(
- getattr(benchmark, benchmark_attribute, set()))
- if merged_attributes:
- setattr(method, method_attribute, merged_attributes)
-
- MergeDecorators(disabled_method_attr, disabled_benchmark_attr)
- MergeDecorators(enabled_method_attr, enabled_benchmark_attr)
+
+ MergeDecorators(method, disabled_method_attr, benchmark,
+ disabled_benchmark_attr)
+ MergeDecorators(method, enabled_method_attr, benchmark,
+ enabled_benchmark_attr)
setattr(BenchmarkSmokeTest, benchmark.Name(), method)
« no previous file with comments | « no previous file | tools/perf/core/benchmark_finders_unittest.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698