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

Side by Side Diff: sky/tools/webkitpy/layout_tests/servers/apache_http.py

Issue 683083004: Re-enable the inspector tests (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 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 | « sky/tests/inspector/dom-mutation-modify-text-node-and-append.sky ('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 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 mojo_gen_dir = self._filesystem.join( 59 mojo_gen_dir = self._filesystem.join(
60 self._filesystem.abspath(port_obj.gen_dir()), "mojo") 60 self._filesystem.abspath(port_obj.gen_dir()), "mojo")
61 sky_gen_dir = self._filesystem.join(
62 self._filesystem.abspath(port_obj.gen_dir()), "sky")
61 js_test_resources_dir = self._filesystem.join(test_dir, "resources") 63 js_test_resources_dir = self._filesystem.join(test_dir, "resources")
62 media_resources_dir = self._filesystem.join(test_dir, "media") 64 media_resources_dir = self._filesystem.join(test_dir, "media")
63 mime_types_path = self._filesystem.join(test_dir, "http", "conf", "mime. types") 65 mime_types_path = self._filesystem.join(test_dir, "http", "conf", "mime. types")
64 cert_file = self._filesystem.join(test_dir, "http", "conf", "webkit-http d.pem") 66 cert_file = self._filesystem.join(test_dir, "http", "conf", "webkit-http d.pem")
65 67
66 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")
67 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" )
68 70
69 self._is_win = self._port_obj.host.platform.is_win() 71 self._is_win = self._port_obj.host.platform.is_win()
70 72
71 start_cmd = [executable, 73 start_cmd = [executable,
72 '-f', '%s' % self._port_obj.path_to_apache_config_file(), 74 '-f', '%s' % self._port_obj.path_to_apache_config_file(),
73 '-C', 'ServerRoot "%s"' % server_root, 75 '-C', 'ServerRoot "%s"' % server_root,
74 '-C', 'DocumentRoot "%s"' % test_dir, 76 '-C', 'DocumentRoot "%s"' % test_dir,
75 '-c', 'Alias /mojo "%s"' % mojo_gen_dir, 77 '-c', 'Alias /mojo "%s"' % mojo_gen_dir,
78 '-c', 'Alias /sky "%s"' % sky_gen_dir,
76 '-c', 'Alias /js-test-resources "%s"' % js_test_resources_dir, 79 '-c', 'Alias /js-test-resources "%s"' % js_test_resources_dir,
77 '-c', 'Alias /media-resources "%s"' % media_resources_dir, 80 '-c', 'Alias /media-resources "%s"' % media_resources_dir,
78 '-c', 'TypesConfig "%s"' % mime_types_path, 81 '-c', 'TypesConfig "%s"' % mime_types_path,
79 '-c', 'CustomLog "%s" common' % self._access_log_path, 82 '-c', 'CustomLog "%s" common' % self._access_log_path,
80 '-c', 'ErrorLog "%s"' % self._error_log_path, 83 '-c', 'ErrorLog "%s"' % self._error_log_path,
81 '-c', 'PidFile %s' % self._pid_file, 84 '-c', 'PidFile %s' % self._pid_file,
82 '-c', 'SSLCertificateFile "%s"' % cert_file, 85 '-c', 'SSLCertificateFile "%s"' % cert_file,
83 ] 86 ]
84 87
85 if self._is_win: 88 if self._is_win:
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 retval = proc.returncode 168 retval = proc.returncode
166 err = proc.stderr.read() 169 err = proc.stderr.read()
167 if retval or len(err): 170 if retval or len(err):
168 raise server_base.ServerError('Failed to stop %s: %s' % (self._name, err)) 171 raise server_base.ServerError('Failed to stop %s: %s' % (self._name, err))
169 172
170 # For some reason apache isn't guaranteed to have actually stopped after 173 # For some reason apache isn't guaranteed to have actually stopped after
171 # the stop command returns, so we wait a little while longer for the 174 # the stop command returns, so we wait a little while longer for the
172 # pid file to be removed. 175 # pid file to be removed.
173 if not self._wait_for_action(lambda: not self._filesystem.exists(self._p id_file)): 176 if not self._wait_for_action(lambda: not self._filesystem.exists(self._p id_file)):
174 raise server_base.ServerError('Failed to stop %s: pid file still exi sts' % self._name) 177 raise server_base.ServerError('Failed to stop %s: pid file still exi sts' % self._name)
OLDNEW
« no previous file with comments | « sky/tests/inspector/dom-mutation-modify-text-node-and-append.sky ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698