| 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 502 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 513 def stop_websocket_server(self): | 513 def stop_websocket_server(self): |
| 514 pass | 514 pass |
| 515 | 515 |
| 516 def release_http_lock(self): | 516 def release_http_lock(self): |
| 517 pass | 517 pass |
| 518 | 518 |
| 519 def path_to_apache(self): | 519 def path_to_apache(self): |
| 520 return "/usr/sbin/httpd" | 520 return "/usr/sbin/httpd" |
| 521 | 521 |
| 522 def path_to_apache_config_file(self): | 522 def path_to_apache_config_file(self): |
| 523 return self._filesystem.join(self.layout_tests_dir(), 'http', 'conf', 'h
ttpd.conf') | 523 return self._filesystem.join(self.apache_config_directory(), 'httpd.conf
') |
| 524 | 524 |
| 525 def path_to_generic_test_expectations_file(self): | 525 def path_to_generic_test_expectations_file(self): |
| 526 return self._generic_expectations_path | 526 return self._generic_expectations_path |
| 527 | 527 |
| 528 def all_test_configurations(self): | 528 def all_test_configurations(self): |
| 529 """Returns a sequence of the TestConfigurations the port supports.""" | 529 """Returns a sequence of the TestConfigurations the port supports.""" |
| 530 # By default, we assume we want to test every graphics type in | 530 # By default, we assume we want to test every graphics type in |
| 531 # every configuration on every system. | 531 # every configuration on every system. |
| 532 test_configurations = [] | 532 test_configurations = [] |
| 533 for version, architecture in self.all_systems: | 533 for version, architecture in self.all_systems: |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 641 else: | 641 else: |
| 642 image = test.actual_image | 642 image = test.actual_image |
| 643 return DriverOutput(actual_text, image, test.actual_checksum, audio, | 643 return DriverOutput(actual_text, image, test.actual_checksum, audio, |
| 644 crash=(crash or web_process_crash), crashed_process_
name=crashed_process_name, | 644 crash=(crash or web_process_crash), crashed_process_
name=crashed_process_name, |
| 645 crashed_pid=crashed_pid, crash_log=crash_log, | 645 crashed_pid=crashed_pid, crash_log=crash_log, |
| 646 test_time=time.time() - start_time, timeout=test.tim
eout, error=test.error, pid=self.pid, | 646 test_time=time.time() - start_time, timeout=test.tim
eout, error=test.error, pid=self.pid, |
| 647 leak=test.leak) | 647 leak=test.leak) |
| 648 | 648 |
| 649 def stop(self): | 649 def stop(self): |
| 650 self.started = False | 650 self.started = False |
| OLD | NEW |