Rename telemetry.test.Test to telemetry.benchmark.Benchmark.

tools/perf/benchmarks/benchmark_unittest.py

Index: tools/perf/benchmarks/benchmark_unittest.py
diff --git a/tools/perf/benchmarks/benchmark_unittest.py b/tools/perf/benchmarks/benchmark_unittest.py
index 32755c4ad3a37cdbff447e6f53cd0afdc5812be5..15813545828680fa750821cba28e1625da981e20 100644
--- a/tools/perf/benchmarks/benchmark_unittest.py
+++ b/tools/perf/benchmarks/benchmark_unittest.py
@@ -11,7 +11,7 @@ kind of smoke test.
 import os
 import unittest
 
-from telemetry import test
+from telemetry import benchmark as benchmark_module
 from telemetry.core import discover
 from telemetry.page import page_measurement
 from telemetry.unittest import gtest_testrunner
@@ -19,10 +19,10 @@ from telemetry.unittest import options_for_unittests
 
 
 def SmokeTestGenerator(benchmark):
-  # In general you should @test.Disabled individual benchmarks that fail,
-  # instead of this entire smoke test suite.
+  # In general you should @benchmark.Disabled individual benchmarks that fail,

[dtu, 2014/06/25 23:59:38]

benchmark_module

+  # instead of this entire smoke benchmark suite.

[dtu, 2014/06/25 23:59:39]

smoke test

   # TODO(achuith): Multiple tests failing on CrOS. crbug.com/351114
-  @test.Disabled('chromeos')
+  @benchmark_module.Disabled('chromeos')
   def BenchmarkSmokeTest(self):
     # Only measure a single page so that this test cycles reasonably quickly.
     benchmark.options['pageset_repeat'] = 1
@@ -41,12 +41,12 @@ def SmokeTestGenerator(benchmark):
     parser = options.CreateParser()
 
     benchmark.AddCommandLineArgs(parser)
-    test.AddCommandLineArgs(parser)
+    benchmark_module.AddCommandLineArgs(parser)
     benchmark.SetArgumentDefaults(parser)
     options.MergeDefaultValues(parser.get_default_values())
 
     benchmark.ProcessCommandLineArgs(None, options)
-    test.ProcessCommandLineArgs(None, options)
+    benchmark_module.ProcessCommandLineArgs(None, options)
 
     self.assertEqual(0, SinglePageBenchmark().Run(options),
                      msg='Failed: %s' % benchmark)
@@ -65,8 +65,8 @@ def load_tests(_, _2, _3):
       measurements_dir, top_level_dir, page_measurement.PageMeasurement,
       pattern='*.py').values()
   all_benchmarks = discover.DiscoverClasses(
-      benchmarks_dir, top_level_dir, test.Test, pattern='*.py').values()
-
+      benchmarks_dir, top_level_dir, benchmark_module.Benchmark,
+      pattern='*.py').values()
   for benchmark in all_benchmarks:
     if benchmark.PageTestClass() not in all_measurements:
       # If the benchmark is not in measurements, then it is not composable.