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

content/test/gpu/gpu_tests/cloud_storage_test_base.py

 # Copyright 2013 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.
 
 """Base classes for a test and validator which upload results
 (reference images, error images) to cloud storage."""
 
 import os
 import re
 import tempfile
 
-from telemetry import test
+from telemetry import benchmark
 from telemetry.core import bitmap
 from telemetry.page import cloud_storage
 from telemetry.page import page_test
 
 test_data_dir = os.path.abspath(os.path.join(
     os.path.dirname(__file__), '..', '..', 'data', 'gpu'))
 
 default_generated_data_dir = os.path.join(test_data_dir, 'generated')
 
 error_image_cloud_storage_bucket = 'chromium-browser-gpu-tests'
@@ skipping 185 matching lines @@
     except page_test.Failure:
       image_name = self._UrlToImageName(url)
       if self.options.test_machine_name:
         self._UploadErrorImagesToCloudStorage(image_name, screenshot, None)
       else:
         self._WriteErrorImages(self.options.generated_dir, image_name,
                                screenshot, None)
       raise
 
 
-class TestBase(test.Test):
+class TestBase(benchmark.Benchmark):
   @classmethod
   def AddTestCommandLineArgs(cls, group):
     group.add_option('--build-revision',
         help='Chrome revision being tested.',
         default="unknownrev")
     group.add_option('--upload-refimg-to-cloud-storage',
         dest='upload_refimg_to_cloud_storage',
         action='store_true', default=False,
         help='Upload resulting images to cloud storage as reference images')
     group.add_option('--download-refimg-from-cloud-storage',
@@ skipping 14 matching lines @@
         default='')
     group.add_option('--test-machine-name',
         help='Name of the test machine. Specifying this argument causes this '
         'script to upload failure images and diffs to cloud storage directly, '
         'instead of relying on the archive_gpu_pixel_test_results.py script.',
         default='')
     group.add_option('--generated-dir',
         help='Overrides the default on-disk location for generated test images '
         '(only used for local testing without a cloud storage account)',
         default=default_generated_data_dir)