| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 from datetime import datetime | 4 from datetime import datetime |
| 5 import glob | 5 import glob |
| 6 import optparse | 6 import optparse |
| 7 import os | 7 import os |
| 8 import re | 8 import re |
| 9 | 9 |
| 10 import cloud_storage_test_base | 10 import cloud_storage_test_base |
| (...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 141 if ref_png: | 141 if ref_png: |
| 142 return ref_png | 142 return ref_png |
| 143 | 143 |
| 144 print 'Reference image not found. Writing tab contents as reference.' | 144 print 'Reference image not found. Writing tab contents as reference.' |
| 145 | 145 |
| 146 self._WriteImage(image_path, screenshot) | 146 self._WriteImage(image_path, screenshot) |
| 147 return screenshot | 147 return screenshot |
| 148 | 148 |
| 149 class Pixel(cloud_storage_test_base.TestBase): | 149 class Pixel(cloud_storage_test_base.TestBase): |
| 150 test = _PixelValidator | 150 test = _PixelValidator |
| 151 page_set = page_sets.PixelTestsPageSet |
| 151 | 152 |
| 152 @classmethod | 153 @classmethod |
| 153 def AddTestCommandLineArgs(cls, group): | 154 def AddTestCommandLineArgs(cls, group): |
| 154 super(Pixel, cls).AddTestCommandLineArgs(group) | 155 super(Pixel, cls).AddTestCommandLineArgs(group) |
| 155 group.add_option('--reference-dir', | 156 group.add_option('--reference-dir', |
| 156 help='Overrides the default on-disk location for reference images ' | 157 help='Overrides the default on-disk location for reference images ' |
| 157 '(only used for local testing without a cloud storage account)', | 158 '(only used for local testing without a cloud storage account)', |
| 158 default=default_reference_image_dir) | 159 default=default_reference_image_dir) |
| 159 | 160 |
| 160 def CreatePageSet(self, options): | 161 def CreatePageSet(self, options): |
| 161 page_set = page_sets.PixelTestsPageSet() | 162 page_set = super(Pixel, self).CreatePageSet(options) |
| 162 for page in page_set.pages: | 163 for page in page_set.pages: |
| 163 page.script_to_evaluate_on_commit = test_harness_script | 164 page.script_to_evaluate_on_commit = test_harness_script |
| 164 return page_set | 165 return page_set |
| 165 | 166 |
| 166 def CreateExpectations(self, page_set): | 167 def CreateExpectations(self, page_set): |
| 167 return pixel_expectations.PixelExpectations() | 168 return pixel_expectations.PixelExpectations() |
| OLD | NEW |