| OLD | NEW |
| 1 # Copyright (C) 2010 Google Inc. All rights reserved. | 1 # Copyright (C) 2010 Google Inc. All rights reserved. |
| 2 # | 2 # |
| 3 # Redistribution and use in source and binary forms, with or without | 3 # Redistribution and use in source and binary forms, with or without |
| 4 # modification, are permitted provided that the following conditions are | 4 # modification, are permitted provided that the following conditions are |
| 5 # met: | 5 # met: |
| 6 # | 6 # |
| 7 # * Redistributions of source code must retain the above copyright | 7 # * Redistributions of source code must retain the above copyright |
| 8 # notice, this list of conditions and the following disclaimer. | 8 # notice, this list of conditions and the following disclaimer. |
| 9 # * Redistributions in binary form must reproduce the above | 9 # * Redistributions in binary form must reproduce the above |
| 10 # copyright notice, this list of conditions and the following disclaimer | 10 # copyright notice, this list of conditions and the following disclaimer |
| (...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 452 if diffed: | 452 if diffed: |
| 453 return ("< %s\n---\n> %s\n" % (expected_contents, actual_contents),
None) | 453 return ("< %s\n---\n> %s\n" % (expected_contents, actual_contents),
None) |
| 454 return (None, None) | 454 return (None, None) |
| 455 | 455 |
| 456 def layout_tests_dir(self): | 456 def layout_tests_dir(self): |
| 457 return LAYOUT_TEST_DIR | 457 return LAYOUT_TEST_DIR |
| 458 | 458 |
| 459 def perf_tests_dir(self): | 459 def perf_tests_dir(self): |
| 460 return PERF_TEST_DIR | 460 return PERF_TEST_DIR |
| 461 | 461 |
| 462 def webkit_base(self): | 462 def blink_base(self): |
| 463 return '/test.checkout' | 463 return '/test.checkout' |
| 464 | 464 |
| 465 def _skipped_tests_for_unsupported_features(self, test_list): | 465 def _skipped_tests_for_unsupported_features(self, test_list): |
| 466 return set(['failures/expected/skip_text.html', | 466 return set(['failures/expected/skip_text.html', |
| 467 'failures/unexpected/skip_pass.html', | 467 'failures/unexpected/skip_pass.html', |
| 468 'virtual/skipped/failures/expected']) | 468 'virtual/skipped/failures/expected']) |
| 469 | 469 |
| 470 def name(self): | 470 def name(self): |
| 471 return self._name | 471 return self._name |
| 472 | 472 |
| (...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 628 else: | 628 else: |
| 629 image = test.actual_image | 629 image = test.actual_image |
| 630 return DriverOutput(actual_text, image, test.actual_checksum, audio, | 630 return DriverOutput(actual_text, image, test.actual_checksum, audio, |
| 631 crash=(crash or web_process_crash), crashed_process_
name=crashed_process_name, | 631 crash=(crash or web_process_crash), crashed_process_
name=crashed_process_name, |
| 632 crashed_pid=crashed_pid, crash_log=crash_log, | 632 crashed_pid=crashed_pid, crash_log=crash_log, |
| 633 test_time=time.time() - start_time, timeout=test.tim
eout, error=test.error, pid=self.pid, | 633 test_time=time.time() - start_time, timeout=test.tim
eout, error=test.error, pid=self.pid, |
| 634 leak=test.leak) | 634 leak=test.leak) |
| 635 | 635 |
| 636 def stop(self): | 636 def stop(self): |
| 637 self.started = False | 637 self.started = False |
| OLD | NEW |