| 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 467 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 478 | 478 |
| 479 def default_results_directory(self): | 479 def default_results_directory(self): |
| 480 return '/tmp/layout-test-results' | 480 return '/tmp/layout-test-results' |
| 481 | 481 |
| 482 def setup_test_run(self): | 482 def setup_test_run(self): |
| 483 pass | 483 pass |
| 484 | 484 |
| 485 def _driver_class(self): | 485 def _driver_class(self): |
| 486 return TestDriver | 486 return TestDriver |
| 487 | 487 |
| 488 def start_http_server(self, additional_dirs, number_of_drivers): | 488 def start_sky_server(self, additional_dirs, number_of_drivers): |
| 489 pass | 489 pass |
| 490 | 490 |
| 491 def start_websocket_server(self): | 491 def start_websocket_server(self): |
| 492 pass | 492 pass |
| 493 | 493 |
| 494 def acquire_http_lock(self): | 494 def acquire_http_lock(self): |
| 495 pass | 495 pass |
| 496 | 496 |
| 497 def stop_http_server(self): | 497 def stop_sky_server(self): |
| 498 pass | 498 pass |
| 499 | 499 |
| 500 def stop_websocket_server(self): | 500 def stop_websocket_server(self): |
| 501 pass | 501 pass |
| 502 | 502 |
| 503 def release_http_lock(self): | 503 def release_http_lock(self): |
| 504 pass | 504 pass |
| 505 | 505 |
| 506 def path_to_apache(self): | 506 def path_to_apache(self): |
| 507 return "/usr/sbin/httpd" | 507 return "/usr/sbin/httpd" |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 637 else: | 637 else: |
| 638 image = test.actual_image | 638 image = test.actual_image |
| 639 return DriverOutput(actual_text, image, test.actual_checksum, audio, | 639 return DriverOutput(actual_text, image, test.actual_checksum, audio, |
| 640 crash=(crash or web_process_crash), crashed_process_name=crashed_pro
cess_name, | 640 crash=(crash or web_process_crash), crashed_process_name=crashed_pro
cess_name, |
| 641 crashed_pid=crashed_pid, crash_log=crash_log, | 641 crashed_pid=crashed_pid, crash_log=crash_log, |
| 642 test_time=time.time() - start_time, timeout=test.timeout, error=test
.error, pid=self.pid, | 642 test_time=time.time() - start_time, timeout=test.timeout, error=test
.error, pid=self.pid, |
| 643 leak=test.leak) | 643 leak=test.leak) |
| 644 | 644 |
| 645 def stop(self): | 645 def stop(self): |
| 646 self.started = False | 646 self.started = False |
| OLD | NEW |