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

content/test/gpu/gpu_tests/webgl_conformance.py

 # Copyright (c) 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.
 import json
 import optparse
 import os
 import sys
 
 import webgl_conformance_expectations
 
-from telemetry import test as test_module
+from telemetry import benchmark as benchmark_module
 from telemetry.core import util
 from telemetry.page import page_set
 from telemetry.page import page as page_module
 from telemetry.page import page_test
 # pylint: disable=W0401,W0614
 from telemetry.page.actions.all_page_actions import *
 
 
 conformance_path = os.path.join(
     util.GetChromiumSrcDir(),
@@ skipping 71 matching lines @@
               test.replace('/', '_').replace('-', '_').
                  replace('\\', '_').rpartition('.')[0].replace('.', '_')))
     self.script_to_evaluate_on_commit = conformance_harness_script
 
   def RunNavigateSteps(self, action_runner):
     action_runner.NavigateToPage(self)
     action_runner.WaitForJavaScriptCondition(
         'webglTestHarness._finished', timeout=120)
 
 
-class WebglConformance(test_module.Test):
+class WebglConformance(benchmark_module.Benchmark):
   """Conformance with Khronos WebGL Conformance Tests"""
   test = WebglConformanceValidator
 
   @classmethod
   def AddTestCommandLineArgs(cls, group):
     group.add_option('--webgl-conformance-version',
         help='Version of the WebGL conformance tests to run.',
         default='1.0.3')
 
   def CreatePageSet(self, options):
@@ skipping 51 matching lines @@
 
         if '.txt' in test_name:
           include_path = os.path.join(current_dir, test_name)
           test_paths += WebglConformance._ParseTests(
             include_path, version)
         else:
           test = os.path.join(current_dir, test_name)
           test_paths.append(test)
 
     return test_paths