[telemetry] Fix benchmark smoke unittest _disabled_strings logic, take 2.

[telemetry] Fix benchmark smoke unittest _disabled_strings logic, take 2.


BUG=420615
TEST=tools/perf/run_benchmark --browser=canary  # On Mac OS 10.9.
TBR=tonyg

[dtu, 2014-11-21 08:14:07]

dtu@chromium.org changed reviewers:
+ dpranke@chromium.org

[dtu, 2014-11-21 08:14:11]

The CQ bit was checked by dtu@chromium.org

[commit-bot: I haz the power, 2014-11-21 08:14:16]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/745143003/1

[commit-bot: I haz the power, 2014-11-21 09:16:15]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-11-21 09:16:17]

Failed to apply patch for tools/perf/benchmarks/benchmark_smoke_unittest.py:
While running git apply --index -3 -p1;
  error: patch failed: tools/perf/benchmarks/benchmark_smoke_unittest.py:106
  Falling back to three-way merge...
  Applied patch to 'tools/perf/benchmarks/benchmark_smoke_unittest.py' with
conflicts.
  U tools/perf/benchmarks/benchmark_smoke_unittest.py

Patch:       tools/perf/benchmarks/benchmark_smoke_unittest.py
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
97dd867e1e715ff879590f32b09607a6fdce3eb2..ea0b9d401841e4ec0db9c61f2c7cd01a6fb26237
100644
--- a/tools/perf/benchmarks/benchmark_smoke_unittest.py
+++ b/tools/perf/benchmarks/benchmark_smoke_unittest.py
@@ -106,14 +106,16 @@ def load_tests(_, _2, _3):
     # 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.
     if hasattr(benchmark, '_enabled_strings'):
-      if hasattr(method, '_enabled_strings'):
+      if (hasattr(method, '_enabled_strings') and
+          method._enabled_strings and benchmark._enabled_strings):
         method._enabled_strings += benchmark._enabled_strings
-      else:
+      elif not hasattr(method, '_enabled_strings') or method._enabled_strings:
         method._enabled_strings = benchmark._enabled_strings
     if hasattr(benchmark, '_disabled_strings'):
-      if hasattr(method, '_disabled_strings'):
+      if (hasattr(method, '_disabled_strings') and
+          method._disabled_strings and benchmark._disabled_strings):
         method._disabled_strings += benchmark._disabled_strings
-      else:
+      elif not hasattr(method, '_disabled_strings') or
method._disabled_strings:
         method._disabled_strings = benchmark._disabled_strings
     setattr(BenchmarkSmokeTest, benchmark.Name(), method)

[commit-bot: I haz the power, 2014-11-21 09:16:27]

The CQ bit was unchecked by commit-bot@chromium.org

[tonyg, 2015-01-14 18:22:07]

tonyg@chromium.org changed reviewers:
- tonyg@chromium.org

[Dirk Pranke, 2016-08-31 16:43:58]

I'm guessing this is long out-of-date and closing it to get it off of my CL
review list. Please reopen if this is a mistake.