| OLD | NEW |
| 1 # Copyright (C) 2010 Google Inc. All rights reserved. | 1 # Copyright (C) 2010 Google Inc. All rights reserved. |
| 2 # Copyright (C) 2010 Gabor Rapcsanyi (rgabor@inf.u-szeged.hu), University of Sze
ged | 2 # Copyright (C) 2010 Gabor Rapcsanyi (rgabor@inf.u-szeged.hu), University of Sze
ged |
| 3 # | 3 # |
| 4 # Redistribution and use in source and binary forms, with or without | 4 # Redistribution and use in source and binary forms, with or without |
| 5 # modification, are permitted provided that the following conditions are | 5 # modification, are permitted provided that the following conditions are |
| 6 # met: | 6 # met: |
| 7 # | 7 # |
| 8 # * Redistributions of source code must retain the above copyright | 8 # * Redistributions of source code must retain the above copyright |
| 9 # notice, this list of conditions and the following disclaimer. | 9 # notice, this list of conditions and the following disclaimer. |
| 10 # * Redistributions in binary form must reproduce the above | 10 # * Redistributions in binary form must reproduce the above |
| (...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 260 if not all(is_expected(actual_result) for actual_result in actual): | 260 if not all(is_expected(actual_result) for actual_result in actual): |
| 261 test_dict['is_unexpected'] = True | 261 test_dict['is_unexpected'] = True |
| 262 | 262 |
| 263 test_dict.update(_interpret_test_failures(result.failures)) | 263 test_dict.update(_interpret_test_failures(result.failures)) |
| 264 | 264 |
| 265 if retry_results: | 265 if retry_results: |
| 266 retry_result = retry_results.unexpected_results_by_name.get(test_nam
e) | 266 retry_result = retry_results.unexpected_results_by_name.get(test_nam
e) |
| 267 if retry_result: | 267 if retry_result: |
| 268 test_dict.update(_interpret_test_failures(retry_result.failures)
) | 268 test_dict.update(_interpret_test_failures(retry_result.failures)
) |
| 269 | 269 |
| 270 if (result.has_repaint_overlay): |
| 271 test_dict['has_repaint_overlay'] = True |
| 272 |
| 270 # Store test hierarchically by directory. e.g. | 273 # Store test hierarchically by directory. e.g. |
| 271 # foo/bar/baz.html: test_dict | 274 # foo/bar/baz.html: test_dict |
| 272 # foo/bar/baz1.html: test_dict | 275 # foo/bar/baz1.html: test_dict |
| 273 # | 276 # |
| 274 # becomes | 277 # becomes |
| 275 # foo: { | 278 # foo: { |
| 276 # bar: { | 279 # bar: { |
| 277 # baz.html: test_dict, | 280 # baz.html: test_dict, |
| 278 # baz1.html: test_dict | 281 # baz1.html: test_dict |
| 279 # } | 282 # } |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 313 except Exception, e: | 316 except Exception, e: |
| 314 _log.warn("Failed to determine svn revision for checkout (cwd: %s, webki
t_base: %s), leaving 'revision' key blank in full_results.json.\n%s" % (port_obj
._filesystem.getcwd(), port_obj.path_from_webkit_base(), e)) | 317 _log.warn("Failed to determine svn revision for checkout (cwd: %s, webki
t_base: %s), leaving 'revision' key blank in full_results.json.\n%s" % (port_obj
._filesystem.getcwd(), port_obj.path_from_webkit_base(), e)) |
| 315 # Handle cases where we're running outside of version control. | 318 # Handle cases where we're running outside of version control. |
| 316 import traceback | 319 import traceback |
| 317 _log.debug('Failed to learn head svn revision:') | 320 _log.debug('Failed to learn head svn revision:') |
| 318 _log.debug(traceback.format_exc()) | 321 _log.debug(traceback.format_exc()) |
| 319 results['chromium_revision'] = "" | 322 results['chromium_revision'] = "" |
| 320 results['blink_revision'] = "" | 323 results['blink_revision'] = "" |
| 321 | 324 |
| 322 return results | 325 return results |
| OLD | NEW |