patch from issue 998693002 at patchset 60001 (http://crrev.com/998693002#ps60001)

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 bed257ebb9736c0a777a899a4fc23aed7018d43f..9be3998a03405515c62ee2d936e146f0c5553427 100644
--- a/tools/perf/benchmarks/benchmark_smoke_unittest.py
+++ b/tools/perf/benchmarks/benchmark_smoke_unittest.py
@@ -18,6 +18,7 @@ from telemetry.page import page_test
 from telemetry.unittest_util import options_for_unittests
 from telemetry.unittest_util import progress_reporter
 
+from page_sets import key_silk_cases
 
 def SmokeTestGenerator(benchmark):
   # NOTE TO SHERIFFS: DO NOT DISABLE THIS TEST.
@@ -36,16 +37,18 @@ def SmokeTestGenerator(benchmark):
       def CreatePageSet(self, options):
         # pylint: disable=E1002
         ps = super(SinglePageBenchmark, self).CreatePageSet(options)
-        for p in ps.pages:
-          p.skip_waits = True
-          ps.user_stories = [p]
-          break
+        # Only run PolymerTopeka page.
+        all_pages = ps.user_stories[:]
+        for p in all_pages:
+          if not isinstance(p, key_silk_cases.PolymerTopeka):
+            ps.RemoveUserStory(p)
         return ps
 
     # Set the benchmark's default arguments.
     options = options_for_unittests.GetCopy()
     options.output_format = 'none'
     options.suppress_gtest_report = True
+    options.upload_results = False
     parser = options.CreateParser()
 
     benchmark.AddCommandLineArgs(parser)
@@ -75,7 +78,7 @@ def load_tests(_, _2, _3):
   # has multiple benchmarks, only the last one is returned.
   all_benchmarks = discover.DiscoverClasses(
       benchmarks_dir, top_level_dir, benchmark_module.Benchmark,
-      index_by_class_name=False).values()
+      index_by_class_name=True).values()
   for benchmark in all_benchmarks:
     if hasattr(benchmark, 'test') and benchmark.test not in all_measurements:
       # If the benchmark does not have a measurement, then it is not composable.