| 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 cfd8cdcf26ca93c7acc4759227d02ed0d19e4084..7d17e750fc4b178d118db429dc5d7843551fa051 100644
|
| --- a/tools/perf/benchmarks/benchmark_smoke_unittest.py
|
| +++ b/tools/perf/benchmarks/benchmark_smoke_unittest.py
|
| @@ -143,19 +143,10 @@ def load_tests(loader, standard_tests, pattern):
|
| # test from the class. We should probably discover all of the tests
|
| # in a class, and then throw the ones we don't need away instead.
|
|
|
| - # TODO(aiolos): remove try after all telemetry-side changes land.
|
| - try:
|
| - decorators.IS_UPDATED_DECORATORS
|
| - except AttributeError:
|
| - enabled_benchmark_attr = '_enabled_strings'
|
| - enabled_method_attr = '_enabled_strings'
|
| - disabled_benchmark_attr = '_disabled_strings'
|
| - disabled_method_attr = '_disabled_strings'
|
| - else:
|
| - disabled_benchmark_attr = decorators.DisabledAttributeName(benchmark)
|
| - disabled_method_attr = decorators.DisabledAttributeName(method)
|
| - enabled_benchmark_attr = decorators.EnabledAttributeName(benchmark)
|
| - enabled_method_attr = decorators.EnabledAttributeName(method)
|
| + disabled_benchmark_attr = decorators.DisabledAttributeName(benchmark)
|
| + disabled_method_attr = decorators.DisabledAttributeName(method)
|
| + enabled_benchmark_attr = decorators.EnabledAttributeName(benchmark)
|
| + enabled_method_attr = decorators.EnabledAttributeName(method)
|
|
|
| MergeDecorators(method, disabled_method_attr, benchmark,
|
| disabled_benchmark_attr)
|
|
|