Chromium Code Reviews| 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 445 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 456 if not actual_contents or not expected_contents: | 456 if not actual_contents or not expected_contents: |
| 457 return (True, None) | 457 return (True, None) |
| 458 if diffed: | 458 if diffed: |
| 459 return ('< %s\n---\n> %s\n' % (expected_contents, actual_contents), None) | 459 return ('< %s\n---\n> %s\n' % (expected_contents, actual_contents), None) |
| 460 return (None, None) | 460 return (None, None) |
| 461 | 461 |
| 462 def layout_tests_dir(self): | 462 def layout_tests_dir(self): |
| 463 return LAYOUT_TEST_DIR | 463 return LAYOUT_TEST_DIR |
| 464 | 464 |
| 465 def perf_tests_dir(self): | 465 def perf_tests_dir(self): |
| 466 return PERF_TEST_DIR | 466 return PERF_TEST_DIR |
|
qyearsley
2017/05/09 21:46:28
Later, we may want to change the layout_tests_dir
tkent
2017/05/10 23:42:21
Port.layout_tests_dir can be different from webkit
| |
| 467 | 467 |
| 468 def webkit_base(self): | |
| 469 return '/test.checkout' | |
|
qyearsley
2017/05/09 21:46:28
I would have expected that changing this might req
tkent
2017/05/10 23:42:21
Port.webkit_base() was used only for PerTestsRunne
| |
| 470 | |
| 471 def skipped_layout_tests(self, _): | 468 def skipped_layout_tests(self, _): |
| 472 return set(['failures/expected/skip_text.html', | 469 return set(['failures/expected/skip_text.html', |
| 473 'failures/unexpected/skip_pass.html', | 470 'failures/unexpected/skip_pass.html', |
| 474 'virtual/skipped/failures/expected']) | 471 'virtual/skipped/failures/expected']) |
| 475 | 472 |
| 476 def name(self): | 473 def name(self): |
| 477 return self._name | 474 return self._name |
| 478 | 475 |
| 479 def operating_system(self): | 476 def operating_system(self): |
| 480 return self._operating_system | 477 return self._operating_system |
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 632 else: | 629 else: |
| 633 image = test.actual_image | 630 image = test.actual_image |
| 634 return DriverOutput(actual_text, image, test.actual_checksum, audio, | 631 return DriverOutput(actual_text, image, test.actual_checksum, audio, |
| 635 crash=(crash or web_process_crash), crashed_process_ name=crashed_process_name, | 632 crash=(crash or web_process_crash), crashed_process_ name=crashed_process_name, |
| 636 crashed_pid=crashed_pid, crash_log=crash_log, | 633 crashed_pid=crashed_pid, crash_log=crash_log, |
| 637 test_time=time.time() - start_time, timeout=test.tim eout, error=test.error, pid=self.pid, | 634 test_time=time.time() - start_time, timeout=test.tim eout, error=test.error, pid=self.pid, |
| 638 leak=test.leak) | 635 leak=test.leak) |
| 639 | 636 |
| 640 def stop(self): | 637 def stop(self): |
| 641 self.started = False | 638 self.started = False |
| OLD | NEW |