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

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

Issue 2274743004: Make sure that Apache for HTTP layout tests not to emit Content-Type by default (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 3 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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 '-c', 'Alias /w3c/resources/WebIDLParser.js "%s/webidl2/lib/webidl2. js"' % imported_resources_dir, 79 '-c', 'Alias /w3c/resources/WebIDLParser.js "%s/webidl2/lib/webidl2. js"' % imported_resources_dir,
80 '-c', 'Alias /w3c/resources "%s"' % imported_resources_dir, 80 '-c', 'Alias /w3c/resources "%s"' % imported_resources_dir,
81 '-c', 'Alias /forms-test-resources "%s"' % forms_test_resources_dir, 81 '-c', 'Alias /forms-test-resources "%s"' % forms_test_resources_dir,
82 '-c', 'Alias /media-resources "%s"' % media_resources_dir, 82 '-c', 'Alias /media-resources "%s"' % media_resources_dir,
83 '-c', 'TypesConfig "%s"' % mime_types_path, 83 '-c', 'TypesConfig "%s"' % mime_types_path,
84 '-c', 'CustomLog "%s" common' % self._access_log_path, 84 '-c', 'CustomLog "%s" common' % self._access_log_path,
85 '-c', 'ErrorLog "%s"' % self._error_log_path, 85 '-c', 'ErrorLog "%s"' % self._error_log_path,
86 '-c', 'PidFile %s' % self._pid_file, 86 '-c', 'PidFile %s' % self._pid_file,
87 '-c', 'SSLCertificateFile "%s"' % cert_file, 87 '-c', 'SSLCertificateFile "%s"' % cert_file,
88 '-c', 'Alias /inspector-sources "%s"' % inspector_sources_dir, 88 '-c', 'Alias /inspector-sources "%s"' % inspector_sources_dir,
89 '-c', 'DefaultType None',
89 ] 90 ]
90 91
91 if self._is_win: 92 if self._is_win:
92 start_cmd += ['-c', "ThreadsPerChild %d" % (self._number_of_servers * 8)] 93 start_cmd += ['-c', "ThreadsPerChild %d" % (self._number_of_servers * 8)]
93 else: 94 else:
94 start_cmd += ['-c', "StartServers %d" % self._number_of_servers, 95 start_cmd += ['-c', "StartServers %d" % self._number_of_servers,
95 '-c', "MinSpareServers %d" % self._number_of_servers, 96 '-c', "MinSpareServers %d" % self._number_of_servers,
96 '-c', "MaxSpareServers %d" % self._number_of_servers, 97 '-c', "MaxSpareServers %d" % self._number_of_servers,
97 '-C', 'User "%s"' % self._port_obj.host.environ.get('U SERNAME', self._port_obj.host.environ.get('USER', '')), 98 '-C', 'User "%s"' % self._port_obj.host.environ.get('U SERNAME', self._port_obj.host.environ.get('USER', '')),
98 '-k', 'start'] 99 '-k', 'start']
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 retval = proc.returncode 170 retval = proc.returncode
170 err = proc.stderr.read() 171 err = proc.stderr.read()
171 if retval or len(err): 172 if retval or len(err):
172 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))
173 174
174 # 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
175 # 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
176 # pid file to be removed. 177 # pid file to be removed.
177 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)):
178 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)
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/http/tests/security/contentTypeOptions/nosniff-script-without-content-type-blocked-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698