| OLD | NEW |
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 """Base classes for a test and validator which upload results | 5 """Base classes for a test and validator which upload results |
| 6 (reference images, error images) to cloud storage.""" | 6 (reference images, error images) to cloud storage.""" |
| 7 | 7 |
| 8 import logging | 8 import logging |
| 9 import os | 9 import os |
| 10 import re | 10 import re |
| (...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 258 except page_test.Failure: | 258 except page_test.Failure: |
| 259 image_name = self._UrlToImageName(url) | 259 image_name = self._UrlToImageName(url) |
| 260 if self.options.test_machine_name: | 260 if self.options.test_machine_name: |
| 261 self._UploadErrorImagesToCloudStorage(image_name, screenshot, None) | 261 self._UploadErrorImagesToCloudStorage(image_name, screenshot, None) |
| 262 else: | 262 else: |
| 263 self._WriteErrorImages(self.options.generated_dir, image_name, | 263 self._WriteErrorImages(self.options.generated_dir, image_name, |
| 264 screenshot, None) | 264 screenshot, None) |
| 265 raise | 265 raise |
| 266 | 266 |
| 267 | 267 |
| 268 class TestBase(gpu_test_base.TestBase): | 268 class CloudStorageTestBase(gpu_test_base.TestBase): |
| 269 @classmethod | 269 @classmethod |
| 270 def AddBenchmarkCommandLineArgs(cls, group): | 270 def AddBenchmarkCommandLineArgs(cls, group): |
| 271 group.add_option('--build-revision', | 271 group.add_option('--build-revision', |
| 272 help='Chrome revision being tested.', | 272 help='Chrome revision being tested.', |
| 273 default="unknownrev") | 273 default="unknownrev") |
| 274 group.add_option('--upload-refimg-to-cloud-storage', | 274 group.add_option('--upload-refimg-to-cloud-storage', |
| 275 dest='upload_refimg_to_cloud_storage', | 275 dest='upload_refimg_to_cloud_storage', |
| 276 action='store_true', default=False, | 276 action='store_true', default=False, |
| 277 help='Upload resulting images to cloud storage as reference images') | 277 help='Upload resulting images to cloud storage as reference images') |
| 278 group.add_option('--download-refimg-from-cloud-storage', | 278 group.add_option('--download-refimg-from-cloud-storage', |
| (...skipping 14 matching lines...) Expand all Loading... |
| 293 default='') | 293 default='') |
| 294 group.add_option('--test-machine-name', | 294 group.add_option('--test-machine-name', |
| 295 help='Name of the test machine. Specifying this argument causes this ' | 295 help='Name of the test machine. Specifying this argument causes this ' |
| 296 'script to upload failure images and diffs to cloud storage directly, ' | 296 'script to upload failure images and diffs to cloud storage directly, ' |
| 297 'instead of relying on the archive_gpu_pixel_test_results.py script.', | 297 'instead of relying on the archive_gpu_pixel_test_results.py script.', |
| 298 default='') | 298 default='') |
| 299 group.add_option('--generated-dir', | 299 group.add_option('--generated-dir', |
| 300 help='Overrides the default on-disk location for generated test images ' | 300 help='Overrides the default on-disk location for generated test images ' |
| 301 '(only used for local testing without a cloud storage account)', | 301 '(only used for local testing without a cloud storage account)', |
| 302 default=default_generated_data_dir) | 302 default=default_generated_data_dir) |
| OLD | NEW |