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

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

Issue 1948033003: Convert most geolocation layout tests to use a JS mock implementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@permission-disconnect
Patch Set: Created 4 years, 7 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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 self._access_log_path = self._filesystem.join(output_dir, "access_log.tx t") 69 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" ) 70 self._error_log_path = self._filesystem.join(output_dir, "error_log.txt" )
71 71
72 self._is_win = self._port_obj.host.platform.is_win() 72 self._is_win = self._port_obj.host.platform.is_win()
73 73
74 start_cmd = [ 74 start_cmd = [
75 executable, 75 executable,
76 '-f', '%s' % self._port_obj.path_to_apache_config_file(), 76 '-f', '%s' % self._port_obj.path_to_apache_config_file(),
77 '-C', 'ServerRoot "%s"' % server_root, 77 '-C', 'ServerRoot "%s"' % server_root,
78 '-C', 'DocumentRoot "%s"' % document_root, 78 '-C', 'DocumentRoot "%s"' % document_root,
79 '-c', 'Alias /js-test-resources "%s"' % js_test_resources_dir, 79 '-c', 'AliasMatch /(.*/)?js-test-resources/(.+) "%s/$1resources/$2"' % test_dir,
Dirk Pranke 2016/05/10 20:51:49 why was this change needed, and what did it do?
Sam McNally 2016/05/11 00:40:41 The existing /js-test-resources allows http layout
80 '-c', 'AliasMatch ^/resources/testharness([r.].*) "%s/testharness$1" ' % imported_resources_dir, 80 '-c', 'AliasMatch ^/resources/testharness([r.].*) "%s/testharness$1" ' % imported_resources_dir,
81 '-c', 'Alias /w3c/resources/WebIDLParser.js "%s/webidl2/lib/webidl2. js"' % imported_resources_dir, 81 '-c', 'Alias /w3c/resources/WebIDLParser.js "%s/webidl2/lib/webidl2. js"' % imported_resources_dir,
82 '-c', 'Alias /w3c/resources "%s"' % imported_resources_dir, 82 '-c', 'Alias /w3c/resources "%s"' % imported_resources_dir,
83 '-c', 'Alias /forms-test-resources "%s"' % forms_test_resources_dir, 83 '-c', 'Alias /forms-test-resources "%s"' % forms_test_resources_dir,
84 '-c', 'Alias /media-resources "%s"' % media_resources_dir, 84 '-c', 'Alias /media-resources "%s"' % media_resources_dir,
85 '-c', 'TypesConfig "%s"' % mime_types_path, 85 '-c', 'TypesConfig "%s"' % mime_types_path,
86 '-c', 'CustomLog "%s" common' % self._access_log_path, 86 '-c', 'CustomLog "%s" common' % self._access_log_path,
87 '-c', 'ErrorLog "%s"' % self._error_log_path, 87 '-c', 'ErrorLog "%s"' % self._error_log_path,
88 '-c', 'PidFile %s' % self._pid_file, 88 '-c', 'PidFile %s' % self._pid_file,
89 '-c', 'SSLCertificateFile "%s"' % cert_file, 89 '-c', 'SSLCertificateFile "%s"' % cert_file,
(...skipping 81 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