OLD | NEW |
1 # Copyright (C) 2011 Google Inc. All rights reserved. | 1 # Copyright (C) 2011 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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
51 {'port': 8443, 'sslcert': True}] | 51 {'port': 8443, 'sslcert': True}] |
52 self._number_of_servers = number_of_servers | 52 self._number_of_servers = number_of_servers |
53 | 53 |
54 self._pid_file = self._filesystem.join(self._runtime_path, '%s.pid' % se
lf._name) | 54 self._pid_file = self._filesystem.join(self._runtime_path, '%s.pid' % se
lf._name) |
55 | 55 |
56 executable = self._port_obj.path_to_apache() | 56 executable = self._port_obj.path_to_apache() |
57 server_root = self._filesystem.dirname(self._filesystem.dirname(executab
le)) | 57 server_root = self._filesystem.dirname(self._filesystem.dirname(executab
le)) |
58 | 58 |
59 test_dir = self._port_obj.layout_tests_dir() | 59 test_dir = self._port_obj.layout_tests_dir() |
60 document_root = self._filesystem.join(test_dir, "http", "tests") | 60 document_root = self._filesystem.join(test_dir, "http", "tests") |
61 js_test_resources_dir = self._filesystem.join(test_dir, "resources") | |
62 forms_test_resources_dir = self._filesystem.join(test_dir, "fast", "form
s", "resources") | 61 forms_test_resources_dir = self._filesystem.join(test_dir, "fast", "form
s", "resources") |
63 imported_resources_dir = self._filesystem.join(test_dir, "imported", "wp
t", "resources") | 62 imported_resources_dir = self._filesystem.join(test_dir, "imported", "wp
t", "resources") |
64 media_resources_dir = self._filesystem.join(test_dir, "media") | 63 media_resources_dir = self._filesystem.join(test_dir, "media") |
65 mime_types_path = self._filesystem.join(test_dir, "http", "conf", "mime.
types") | 64 mime_types_path = self._filesystem.join(test_dir, "http", "conf", "mime.
types") |
66 cert_file = self._filesystem.join(test_dir, "http", "conf", "webkit-http
d.pem") | 65 cert_file = self._filesystem.join(test_dir, "http", "conf", "webkit-http
d.pem") |
67 inspector_sources_dir = self._port_obj.inspector_build_directory() | 66 inspector_sources_dir = self._port_obj.inspector_build_directory() |
68 | 67 |
69 self._access_log_path = self._filesystem.join(output_dir, "access_log.tx
t") | 68 self._access_log_path = self._filesystem.join(output_dir, "access_log.tx
t") |
70 self._error_log_path = self._filesystem.join(output_dir, "error_log.txt"
) | 69 self._error_log_path = self._filesystem.join(output_dir, "error_log.txt"
) |
71 | 70 |
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
171 retval = proc.returncode | 170 retval = proc.returncode |
172 err = proc.stderr.read() | 171 err = proc.stderr.read() |
173 if retval or len(err): | 172 if retval or len(err): |
174 raise server_base.ServerError('Failed to stop %s: %s' % (self._name,
err)) | 173 raise server_base.ServerError('Failed to stop %s: %s' % (self._name,
err)) |
175 | 174 |
176 # For some reason apache isn't guaranteed to have actually stopped after | 175 # For some reason apache isn't guaranteed to have actually stopped after |
177 # the stop command returns, so we wait a little while longer for the | 176 # the stop command returns, so we wait a little while longer for the |
178 # pid file to be removed. | 177 # pid file to be removed. |
179 if not self._wait_for_action(lambda: not self._filesystem.exists(self._p
id_file)): | 178 if not self._wait_for_action(lambda: not self._filesystem.exists(self._p
id_file)): |
180 raise server_base.ServerError('Failed to stop %s: pid file still exi
sts' % self._name) | 179 raise server_base.ServerError('Failed to stop %s: pid file still exi
sts' % self._name) |
OLD | NEW |