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

tools/perf/benchmarks/spaceport.py

 # Copyright 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Runs spaceport.io's PerfMarks benchmark."""
 
 import logging
 import os
 
-from telemetry import test
+from telemetry import benchmark
 from telemetry.core import util
 from telemetry.page import page_measurement
 from telemetry.page import page_set
 
 
 class _SpaceportMeasurement(page_measurement.PageMeasurement):
   def __init__(self):
     super(_SpaceportMeasurement, self).__init__()
 
   def CustomizeBrowserOptions(self, options):
@@ skipping 28 matching lines @@
         'JSON.stringify(window.__results)'))
     for key in result_dict:
       chart, trace = key.split('.', 1)
       results.Add(trace, 'objects (bigger is better)', float(result_dict[key]),
                   chart_name=chart, data_type='unimportant')
     results.Add('Score', 'objects (bigger is better)',
                 [float(x) for x in result_dict.values()])
 
 
 # crbug.com/166703: This test frequently times out on Windows.
-@test.Disabled('mac', 'win')
-class Spaceport(test.Test):
+@benchmark.Disabled('mac', 'win')
+class Spaceport(benchmark.Benchmark):
   """spaceport.io's PerfMarks benchmark."""
   test = _SpaceportMeasurement
 
   def CreatePageSet(self, options):
     spaceport_dir = os.path.join(util.GetChromiumSrcDir(), 'chrome', 'test',
         'data', 'third_party', 'spaceport')
     ps = page_set.PageSet(file_path=spaceport_dir)
     ps.AddPageWithDefaultRunNavigate('file://index.html')
     return ps