OLD | NEW |
1 #!/usr/bin/python | 1 #!/usr/bin/python |
2 | 2 |
3 """ | 3 """ |
4 Copyright 2013 Google Inc. | 4 Copyright 2013 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 Repackage expected/actual GM results as needed by our HTML rebaseline viewer. | 9 Repackage expected/actual GM results as needed by our HTML rebaseline viewer. |
10 """ | 10 """ |
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
340 updated_result_type = result_type | 340 updated_result_type = result_type |
341 extra_columns_dict = { | 341 extra_columns_dict = { |
342 results.KEY__EXTRACOLUMNS__RESULT_TYPE: updated_result_type, | 342 results.KEY__EXTRACOLUMNS__RESULT_TYPE: updated_result_type, |
343 results.KEY__EXTRACOLUMNS__BUILDER: builder, | 343 results.KEY__EXTRACOLUMNS__BUILDER: builder, |
344 results.KEY__EXTRACOLUMNS__TEST: test, | 344 results.KEY__EXTRACOLUMNS__TEST: test, |
345 results.KEY__EXTRACOLUMNS__CONFIG: config, | 345 results.KEY__EXTRACOLUMNS__CONFIG: config, |
346 } | 346 } |
347 try: | 347 try: |
348 image_pair = imagepair.ImagePair( | 348 image_pair = imagepair.ImagePair( |
349 image_diff_db=self._image_diff_db, | 349 image_diff_db=self._image_diff_db, |
350 base_url=gm_json.GM_ACTUALS_ROOT_HTTP_URL, | 350 imageA_base_url=gm_json.GM_ACTUALS_ROOT_HTTP_URL, |
| 351 imageB_base_url=gm_json.GM_ACTUALS_ROOT_HTTP_URL, |
351 imageA_relative_url=expected_image_relative_url, | 352 imageA_relative_url=expected_image_relative_url, |
352 imageB_relative_url=actual_image_relative_url, | 353 imageB_relative_url=actual_image_relative_url, |
353 expectations=expectations_dict, | 354 expectations=expectations_dict, |
354 extra_columns=extra_columns_dict) | 355 extra_columns=extra_columns_dict) |
355 all_image_pairs.add_image_pair(image_pair) | 356 all_image_pairs.add_image_pair(image_pair) |
356 if updated_result_type != results.KEY__RESULT_TYPE__SUCCEEDED: | 357 if updated_result_type != results.KEY__RESULT_TYPE__SUCCEEDED: |
357 failing_image_pairs.add_image_pair(image_pair) | 358 failing_image_pairs.add_image_pair(image_pair) |
358 except Exception: | 359 except Exception: |
359 logging.exception('got exception while creating new ImagePair') | 360 logging.exception('got exception while creating new ImagePair') |
360 | 361 |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
405 actuals_root=args.actuals, | 406 actuals_root=args.actuals, |
406 expected_root=args.expectations, | 407 expected_root=args.expectations, |
407 ignore_failures_file=args.ignore_failures_file) | 408 ignore_failures_file=args.ignore_failures_file) |
408 gm_json.WriteToFile( | 409 gm_json.WriteToFile( |
409 results_obj.get_packaged_results_of_type(results_type=args.results), | 410 results_obj.get_packaged_results_of_type(results_type=args.results), |
410 args.outfile) | 411 args.outfile) |
411 | 412 |
412 | 413 |
413 if __name__ == '__main__': | 414 if __name__ == '__main__': |
414 main() | 415 main() |
OLD | NEW |