| 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 490 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 501 | 501 | 
| 502     def stop_http_server(self): | 502     def stop_http_server(self): | 
| 503         pass | 503         pass | 
| 504 | 504 | 
| 505     def stop_websocket_server(self): | 505     def stop_websocket_server(self): | 
| 506         pass | 506         pass | 
| 507 | 507 | 
| 508     def release_http_lock(self): | 508     def release_http_lock(self): | 
| 509         pass | 509         pass | 
| 510 | 510 | 
| 511     def _path_to_lighttpd(self): | 511     def path_to_lighttpd(self): | 
| 512         return "/usr/sbin/lighttpd" | 512         return "/usr/sbin/lighttpd" | 
| 513 | 513 | 
| 514     def _path_to_lighttpd_modules(self): | 514     def path_to_lighttpd_modules(self): | 
| 515         return "/usr/lib/lighttpd" | 515         return "/usr/lib/lighttpd" | 
| 516 | 516 | 
| 517     def _path_to_lighttpd_php(self): | 517     def path_to_lighttpd_php(self): | 
| 518         return "/usr/bin/php-cgi" | 518         return "/usr/bin/php-cgi" | 
| 519 | 519 | 
| 520     def _path_to_apache(self): | 520     def path_to_apache(self): | 
| 521         return "/usr/sbin/httpd" | 521         return "/usr/sbin/httpd" | 
| 522 | 522 | 
| 523     def _path_to_apache_config_file(self): | 523     def path_to_apache_config_file(self): | 
| 524         return self._filesystem.join(self.layout_tests_dir(), 'http', 'conf', 'h
     ttpd.conf') | 524         return self._filesystem.join(self.layout_tests_dir(), 'http', 'conf', 'h
     ttpd.conf') | 
| 525 | 525 | 
| 526     def path_to_generic_test_expectations_file(self): | 526     def path_to_generic_test_expectations_file(self): | 
| 527         return self._generic_expectations_path | 527         return self._generic_expectations_path | 
| 528 | 528 | 
| 529     def _port_specific_expectations_files(self): | 529     def _port_specific_expectations_files(self): | 
| 530         return [self._filesystem.join(self._webkit_baseline_path(d), 'TestExpect
     ations') for d in ['test', 'test-win-xp']] | 530         return [self._filesystem.join(self._webkit_baseline_path(d), 'TestExpect
     ations') for d in ['test', 'test-win-xp']] | 
| 531 | 531 | 
| 532     def all_test_configurations(self): | 532     def all_test_configurations(self): | 
| 533         """Returns a sequence of the TestConfigurations the port supports.""" | 533         """Returns a sequence of the TestConfigurations the port supports.""" | 
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 650             image = None | 650             image = None | 
| 651         else: | 651         else: | 
| 652             image = test.actual_image | 652             image = test.actual_image | 
| 653         return DriverOutput(actual_text, image, test.actual_checksum, audio, | 653         return DriverOutput(actual_text, image, test.actual_checksum, audio, | 
| 654             crash=(crash or web_process_crash), crashed_process_name=crashed_pro
     cess_name, | 654             crash=(crash or web_process_crash), crashed_process_name=crashed_pro
     cess_name, | 
| 655             crashed_pid=crashed_pid, crash_log=crash_log, | 655             crashed_pid=crashed_pid, crash_log=crash_log, | 
| 656             test_time=time.time() - start_time, timeout=test.timeout, error=test
     .error, pid=self.pid) | 656             test_time=time.time() - start_time, timeout=test.timeout, error=test
     .error, pid=self.pid) | 
| 657 | 657 | 
| 658     def stop(self): | 658     def stop(self): | 
| 659         self.started = False | 659         self.started = False | 
| OLD | NEW | 
|---|