OLD | NEW |
1 #!/usr/bin/python | 1 #!/usr/bin/python |
2 | 2 |
3 """ | 3 """ |
4 Copyright 2014 Google Inc. | 4 Copyright 2014 Google Inc. |
5 | 5 |
6 Use of this source code is governed by a BSD-style license that can be | 6 Use of this source code is governed by a BSD-style license that can be |
7 found in the LICENSE file. | 7 found in the LICENSE file. |
8 | 8 |
9 Compare GM results for two configs, across all builders. | 9 Compare GM results for two configs, across all builders. |
10 """ | 10 """ |
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
144 results.KEY__EXTRACOLUMNS__TEST: test, | 144 results.KEY__EXTRACOLUMNS__TEST: test, |
145 # TODO(epoger): Right now, the client UI crashes if it receives | 145 # TODO(epoger): Right now, the client UI crashes if it receives |
146 # results that do not include a 'config' column. | 146 # results that do not include a 'config' column. |
147 # Until we fix that, keep the client happy. | 147 # Until we fix that, keep the client happy. |
148 results.KEY__EXTRACOLUMNS__CONFIG: 'TODO', | 148 results.KEY__EXTRACOLUMNS__CONFIG: 'TODO', |
149 } | 149 } |
150 | 150 |
151 try: | 151 try: |
152 image_pair = imagepair.ImagePair( | 152 image_pair = imagepair.ImagePair( |
153 image_diff_db=self._image_diff_db, | 153 image_diff_db=self._image_diff_db, |
154 base_url=gm_json.GM_ACTUALS_ROOT_HTTP_URL, | 154 imageA_base_url=gm_json.GM_ACTUALS_ROOT_HTTP_URL, |
| 155 imageB_base_url=gm_json.GM_ACTUALS_ROOT_HTTP_URL, |
155 imageA_relative_url=configA_image_relative_url, | 156 imageA_relative_url=configA_image_relative_url, |
156 imageB_relative_url=configB_image_relative_url, | 157 imageB_relative_url=configB_image_relative_url, |
157 extra_columns=extra_columns_dict) | 158 extra_columns=extra_columns_dict) |
158 all_image_pairs.add_image_pair(image_pair) | 159 all_image_pairs.add_image_pair(image_pair) |
159 if result_type != results.KEY__RESULT_TYPE__SUCCEEDED: | 160 if result_type != results.KEY__RESULT_TYPE__SUCCEEDED: |
160 failing_image_pairs.add_image_pair(image_pair) | 161 failing_image_pairs.add_image_pair(image_pair) |
161 except (KeyError, TypeError): | 162 except (KeyError, TypeError): |
162 logging.exception( | 163 logging.exception( |
163 'got exception while creating ImagePair for test ' | 164 'got exception while creating ImagePair for test ' |
164 '"%s", builder "%s"' % (test, builder)) | 165 '"%s", builder "%s"' % (test, builder)) |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
199 results_obj = ConfigComparisons(configs=args.config, | 200 results_obj = ConfigComparisons(configs=args.config, |
200 actuals_root=args.actuals, | 201 actuals_root=args.actuals, |
201 generated_images_root=args.workdir) | 202 generated_images_root=args.workdir) |
202 gm_json.WriteToFile( | 203 gm_json.WriteToFile( |
203 results_obj.get_packaged_results_of_type(results_type=args.results), | 204 results_obj.get_packaged_results_of_type(results_type=args.results), |
204 args.outfile) | 205 args.outfile) |
205 | 206 |
206 | 207 |
207 if __name__ == '__main__': | 208 if __name__ == '__main__': |
208 main() | 209 main() |
OLD | NEW |