Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(239)

Side by Side Diff: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/apache_http.py

Issue 2454323004: Make layout test harness extensible with custom layout tests directory (Closed)
Patch Set: Undo non test harness changes Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 self._pid_file = self._filesystem.join(self._runtime_path, '%s.pid' % se lf._name) 53 self._pid_file = self._filesystem.join(self._runtime_path, '%s.pid' % se lf._name)
54 54
55 executable = self._port_obj.path_to_apache() 55 executable = self._port_obj.path_to_apache()
56 server_root = self._filesystem.dirname(self._filesystem.dirname(executab le)) 56 server_root = self._filesystem.dirname(self._filesystem.dirname(executab le))
57 57
58 test_dir = self._port_obj.layout_tests_dir() 58 test_dir = self._port_obj.layout_tests_dir()
59 document_root = self._filesystem.join(test_dir, "http", "tests") 59 document_root = self._filesystem.join(test_dir, "http", "tests")
60 forms_test_resources_dir = self._filesystem.join(test_dir, "fast", "form s", "resources") 60 forms_test_resources_dir = self._filesystem.join(test_dir, "fast", "form s", "resources")
61 imported_resources_dir = self._filesystem.join(test_dir, "imported", "wp t", "resources") 61 imported_resources_dir = self._filesystem.join(test_dir, "imported", "wp t", "resources")
62 media_resources_dir = self._filesystem.join(test_dir, "media") 62 media_resources_dir = self._filesystem.join(test_dir, "media")
63 mime_types_path = self._filesystem.join(test_dir, "http", "conf", "mime. types") 63 mime_types_path = self._filesystem.join(self._port_obj.apache_config_dir ectory(), "mime.types")
64 cert_file = self._filesystem.join(test_dir, "http", "conf", "webkit-http d.pem") 64 cert_file = self._filesystem.join(self._port_obj.apache_config_directory (), "webkit-httpd.pem")
65 inspector_sources_dir = self._port_obj.inspector_build_directory() 65 inspector_sources_dir = self._port_obj.inspector_build_directory()
66 inspector_debug_dir = self._port_obj.inspector_debug_directory() 66 inspector_debug_dir = self._port_obj.inspector_debug_directory()
67 67
68 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")
69 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" )
70 70
71 self._is_win = self._port_obj.host.platform.is_win() 71 self._is_win = self._port_obj.host.platform.is_win()
72 72
73 start_cmd = [ 73 start_cmd = [
74 executable, 74 executable,
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 retval = proc.returncode 173 retval = proc.returncode
174 err = proc.stderr.read() 174 err = proc.stderr.read()
175 if retval or len(err): 175 if retval or len(err):
176 raise server_base.ServerError('Failed to stop %s: %s' % (self._name, err)) 176 raise server_base.ServerError('Failed to stop %s: %s' % (self._name, err))
177 177
178 # For some reason apache isn't guaranteed to have actually stopped after 178 # For some reason apache isn't guaranteed to have actually stopped after
179 # the stop command returns, so we wait a little while longer for the 179 # the stop command returns, so we wait a little while longer for the
180 # pid file to be removed. 180 # pid file to be removed.
181 if not self._wait_for_action(lambda: not self._filesystem.exists(self._p id_file)): 181 if not self._wait_for_action(lambda: not self._filesystem.exists(self._p id_file)):
182 raise server_base.ServerError('Failed to stop %s: pid file still exi sts' % self._name) 182 raise server_base.ServerError('Failed to stop %s: pid file still exi sts' % self._name)
OLDNEW
« no previous file with comments | « third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698