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

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

Issue 2627213003: Rename LayoutTests/imported/ -> LayoutTests/external/. (Closed)
Patch Set: Created 3 years, 11 months 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
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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 self._number_of_servers = number_of_servers 51 self._number_of_servers = number_of_servers
52 52
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, "external", "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(self._port_obj.apache_config_dir ectory(), "mime.types") 63 mime_types_path = self._filesystem.join(self._port_obj.apache_config_dir ectory(), "mime.types")
64 cert_file = self._filesystem.join(self._port_obj.apache_config_directory (), "webkit-httpd.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 66
67 self._access_log_path = self._filesystem.join(output_dir, "access_log.tx t") 67 self._access_log_path = self._filesystem.join(output_dir, "access_log.tx t")
68 self._error_log_path = self._filesystem.join(output_dir, "error_log.txt" ) 68 self._error_log_path = self._filesystem.join(output_dir, "error_log.txt" )
69 69
70 self._is_win = self._port_obj.host.platform.is_win() 70 self._is_win = self._port_obj.host.platform.is_win()
71 71
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 retval = proc.returncode 171 retval = proc.returncode
172 err = proc.stderr.read() 172 err = proc.stderr.read()
173 if retval or len(err): 173 if retval or len(err):
174 raise server_base.ServerError('Failed to stop %s: %s' % (self._name, err)) 174 raise server_base.ServerError('Failed to stop %s: %s' % (self._name, err))
175 175
176 # For some reason apache isn't guaranteed to have actually stopped after 176 # 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 177 # the stop command returns, so we wait a little while longer for the
178 # pid file to be removed. 178 # pid file to be removed.
179 if not self._wait_for_action(lambda: not self._filesystem.exists(self._p id_file)): 179 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) 180 raise server_base.ServerError('Failed to stop %s: pid file still exi sts' % self._name)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698