bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
| 
2929.3.10
by Vincent Ladeuil
 Add a fake https server and test facilities.  | 
1  | 
# Copyright (C) 2006, 2007 Canonical Ltd
 | 
| 
2004.1.25
by v.ladeuil+lp at free
 Shuffle http related test code. Hopefully it ends up at the right place :)  | 
2  | 
#
 | 
3  | 
# This program is free software; you can redistribute it and/or modify
 | 
|
4  | 
# it under the terms of the GNU General Public License as published by
 | 
|
5  | 
# the Free Software Foundation; either version 2 of the License, or
 | 
|
6  | 
# (at your option) any later version.
 | 
|
7  | 
#
 | 
|
8  | 
# This program is distributed in the hope that it will be useful,
 | 
|
9  | 
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
|
10  | 
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
|
11  | 
# GNU General Public License for more details.
 | 
|
12  | 
#
 | 
|
13  | 
# You should have received a copy of the GNU General Public License
 | 
|
14  | 
# along with this program; if not, write to the Free Software
 | 
|
| 
4183.7.1
by Sabin Iacob
 update FSF mailing address  | 
15  | 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 | 
| 
2004.1.25
by v.ladeuil+lp at free
 Shuffle http related test code. Hopefully it ends up at the right place :)  | 
16  | 
|
17  | 
import errno  | 
|
| 
3111.1.2
by Vincent Ladeuil
 Preparatory cleanup.  | 
18  | 
import httplib  | 
| 
2004.1.25
by v.ladeuil+lp at free
 Shuffle http related test code. Hopefully it ends up at the right place :)  | 
19  | 
import os  | 
| 
2146.1.1
by Alexander Belchenko
 fixes for test suite: forgotten imports in HttpServer.py  | 
20  | 
import posixpath  | 
| 
2004.1.25
by v.ladeuil+lp at free
 Shuffle http related test code. Hopefully it ends up at the right place :)  | 
21  | 
import random  | 
22  | 
import re  | 
|
| 
3734.2.8
by Vincent Ladeuil
 Catch spurious exceptions (python-2.6) when SocketServer is shut down.  | 
23  | 
import select  | 
| 
3111.1.2
by Vincent Ladeuil
 Preparatory cleanup.  | 
24  | 
import SimpleHTTPServer  | 
25  | 
import socket  | 
|
| 
3111.1.3
by Vincent Ladeuil
 Rework http test servers classes. Both 1.0 and 1.1 passing tests (1.1 forced manually).  | 
26  | 
import SocketServer  | 
| 
2004.1.25
by v.ladeuil+lp at free
 Shuffle http related test code. Hopefully it ends up at the right place :)  | 
27  | 
import sys  | 
28  | 
import threading  | 
|
29  | 
import time  | 
|
| 
2146.1.1
by Alexander Belchenko
 fixes for test suite: forgotten imports in HttpServer.py  | 
30  | 
import urllib  | 
31  | 
import urlparse  | 
|
| 
2004.1.25
by v.ladeuil+lp at free
 Shuffle http related test code. Hopefully it ends up at the right place :)  | 
32  | 
|
| 
3111.1.2
by Vincent Ladeuil
 Preparatory cleanup.  | 
33  | 
from bzrlib import transport  | 
34  | 
from bzrlib.transport import local  | 
|
| 
2004.1.25
by v.ladeuil+lp at free
 Shuffle http related test code. Hopefully it ends up at the right place :)  | 
35  | 
|
36  | 
||
37  | 
class BadWebserverPath(ValueError):  | 
|
38  | 
def __str__(self):  | 
|
39  | 
return 'path %s is not in %s' % self.args  | 
|
40  | 
||
41  | 
||
| 
3111.1.2
by Vincent Ladeuil
 Preparatory cleanup.  | 
42  | 
class TestingHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):  | 
| 
2420.1.10
by Vincent Ladeuil
 Doc fixes.  | 
43  | 
"""Handles one request.  | 
44  | 
||
| 
3111.1.21
by Vincent Ladeuil
 Add some comments.  | 
45  | 
    A TestingHTTPRequestHandler is instantiated for every request received by
 | 
46  | 
    the associated server. Note that 'request' here is inherited from the base
 | 
|
47  | 
    TCPServer class, for the HTTP server it is really a connection which itself
 | 
|
48  | 
    will handle one or several HTTP requests.
 | 
|
| 
2420.1.10
by Vincent Ladeuil
 Doc fixes.  | 
49  | 
    """
 | 
| 
3111.1.24
by Vincent Ladeuil
 Cleanups.  | 
50  | 
    # Default protocol version
 | 
51  | 
protocol_version = 'HTTP/1.1'  | 
|
52  | 
||
| 
3111.1.2
by Vincent Ladeuil
 Preparatory cleanup.  | 
53  | 
    # The Message-like class used to parse the request headers
 | 
54  | 
MessageClass = httplib.HTTPMessage  | 
|
| 
2004.1.25
by v.ladeuil+lp at free
 Shuffle http related test code. Hopefully it ends up at the right place :)  | 
55  | 
|
| 
3111.1.15
by Vincent Ladeuil
 Provide a way to specify the protocol version at the server layer.  | 
56  | 
def setup(self):  | 
57  | 
SimpleHTTPServer.SimpleHTTPRequestHandler.setup(self)  | 
|
| 
3221.11.13
by Robert Collins
 Allow push --shallow to just work, and fix the testing HTTPServer to not be affected by chdir() calls.  | 
58  | 
self._cwd = self.server._home_dir  | 
| 
3111.1.15
by Vincent Ladeuil
 Provide a way to specify the protocol version at the server layer.  | 
59  | 
tcs = self.server.test_case_server  | 
60  | 
if tcs.protocol_version is not None:  | 
|
61  | 
            # If the test server forced a protocol version, use it
 | 
|
62  | 
self.protocol_version = tcs.protocol_version  | 
|
63  | 
||
| 
2004.1.25
by v.ladeuil+lp at free
 Shuffle http related test code. Hopefully it ends up at the right place :)  | 
64  | 
def log_message(self, format, *args):  | 
| 
2164.2.28
by Vincent Ladeuil
 TestingHTTPServer.test_case_server renamed from test_case to avoid confusions.  | 
65  | 
tcs = self.server.test_case_server  | 
66  | 
tcs.log('webserver - %s - - [%s] %s "%s" "%s"',  | 
|
67  | 
self.address_string(),  | 
|
68  | 
self.log_date_time_string(),  | 
|
69  | 
format % args,  | 
|
| 
3111.1.19
by Vincent Ladeuil
 Merge back test_http_implementations.pc into test_http.py.  | 
70  | 
self.headers.get('referer', '-'),  | 
| 
2164.2.28
by Vincent Ladeuil
 TestingHTTPServer.test_case_server renamed from test_case to avoid confusions.  | 
71  | 
self.headers.get('user-agent', '-'))  | 
| 
2004.1.25
by v.ladeuil+lp at free
 Shuffle http related test code. Hopefully it ends up at the right place :)  | 
72  | 
|
73  | 
def handle_one_request(self):  | 
|
74  | 
"""Handle a single HTTP request.  | 
|
75  | 
||
| 
2831.6.1
by Vincent Ladeuil
 Remove some more noise from test suite.  | 
76  | 
        We catch all socket errors occurring when the client close the
 | 
77  | 
        connection early to avoid polluting the test results.
 | 
|
78  | 
        """
 | 
|
79  | 
try:  | 
|
| 
3111.1.2
by Vincent Ladeuil
 Preparatory cleanup.  | 
80  | 
SimpleHTTPServer.SimpleHTTPRequestHandler.handle_one_request(self)  | 
| 
2831.6.1
by Vincent Ladeuil
 Remove some more noise from test suite.  | 
81  | 
except socket.error, e:  | 
| 
3111.1.24
by Vincent Ladeuil
 Cleanups.  | 
82  | 
            # Any socket error should close the connection, but some errors are
 | 
83  | 
            # due to the client closing early and we don't want to pollute test
 | 
|
| 
3111.1.20
by Vincent Ladeuil
 Make all the test pass. Looks like we are HTTP/1.1 compliant.  | 
84  | 
            # results, so we raise only the others.
 | 
85  | 
self.close_connection = 1  | 
|
86  | 
if (len(e.args) == 0  | 
|
87  | 
or e.args[0] not in (errno.EPIPE, errno.ECONNRESET,  | 
|
88  | 
errno.ECONNABORTED, errno.EBADF)):  | 
|
| 
2831.6.1
by Vincent Ladeuil
 Remove some more noise from test suite.  | 
89  | 
                raise
 | 
90  | 
||
| 
2004.1.25
by v.ladeuil+lp at free
 Shuffle http related test code. Hopefully it ends up at the right place :)  | 
91  | 
_range_regexp = re.compile(r'^(?P<start>\d+)-(?P<end>\d+)$')  | 
92  | 
_tail_regexp = re.compile(r'^-(?P<tail>\d+)$')  | 
|
93  | 
||
94  | 
def parse_ranges(self, ranges_header):  | 
|
| 
2182.2.1
by v.ladeuil+lp at free
 Aaron was right. Thanks to him, the http server RFC2616 compliance  | 
95  | 
"""Parse the range header value and returns ranges and tail.  | 
96  | 
||
97  | 
        RFC2616 14.35 says that syntactically invalid range
 | 
|
98  | 
        specifiers MUST be ignored. In that case, we return 0 for
 | 
|
99  | 
        tail and [] for ranges.
 | 
|
100  | 
        """
 | 
|
| 
2004.1.25
by v.ladeuil+lp at free
 Shuffle http related test code. Hopefully it ends up at the right place :)  | 
101  | 
tail = 0  | 
102  | 
ranges = []  | 
|
| 
2182.2.1
by v.ladeuil+lp at free
 Aaron was right. Thanks to him, the http server RFC2616 compliance  | 
103  | 
if not ranges_header.startswith('bytes='):  | 
104  | 
            # Syntactically invalid header
 | 
|
105  | 
return 0, []  | 
|
106  | 
||
| 
2004.1.25
by v.ladeuil+lp at free
 Shuffle http related test code. Hopefully it ends up at the right place :)  | 
107  | 
ranges_header = ranges_header[len('bytes='):]  | 
108  | 
for range_str in ranges_header.split(','):  | 
|
| 
2182.2.1
by v.ladeuil+lp at free
 Aaron was right. Thanks to him, the http server RFC2616 compliance  | 
109  | 
            # FIXME: RFC2616 says end is optional and default to file_size
 | 
| 
2004.1.25
by v.ladeuil+lp at free
 Shuffle http related test code. Hopefully it ends up at the right place :)  | 
110  | 
range_match = self._range_regexp.match(range_str)  | 
111  | 
if range_match is not None:  | 
|
| 
2182.2.2
by v.ladeuil+lp at free
 Thanks again to Aaron, the http server RFC2616 compliance  | 
112  | 
start = int(range_match.group('start'))  | 
113  | 
end = int(range_match.group('end'))  | 
|
114  | 
if start > end:  | 
|
115  | 
                    # Syntactically invalid range
 | 
|
116  | 
return 0, []  | 
|
117  | 
ranges.append((start, end))  | 
|
| 
2004.1.25
by v.ladeuil+lp at free
 Shuffle http related test code. Hopefully it ends up at the right place :)  | 
118  | 
else:  | 
119  | 
tail_match = self._tail_regexp.match(range_str)  | 
|
120  | 
if tail_match is not None:  | 
|
121  | 
tail = int(tail_match.group('tail'))  | 
|
| 
2182.2.1
by v.ladeuil+lp at free
 Aaron was right. Thanks to him, the http server RFC2616 compliance  | 
122  | 
else:  | 
123  | 
                    # Syntactically invalid range
 | 
|
124  | 
return 0, []  | 
|
| 
2004.1.25
by v.ladeuil+lp at free
 Shuffle http related test code. Hopefully it ends up at the right place :)  | 
125  | 
return tail, ranges  | 
126  | 
||
| 
3111.1.28
by Vincent Ladeuil
 Fix the multi-ranges http server and add tests.  | 
127  | 
def _header_line_length(self, keyword, value):  | 
128  | 
header_line = '%s: %s\r\n' % (keyword, value)  | 
|
129  | 
return len(header_line)  | 
|
130  | 
||
| 
3111.1.23
by Vincent Ladeuil
 Make HTTP/1.1 the default implementation reveals one more bug.  | 
131  | 
def send_head(self):  | 
132  | 
"""Overrides base implementation to work around a bug in python2.5."""  | 
|
133  | 
path = self.translate_path(self.path)  | 
|
134  | 
if os.path.isdir(path) and not self.path.endswith('/'):  | 
|
135  | 
            # redirect browser - doing basically what apache does when
 | 
|
136  | 
            # DirectorySlash option is On which is quite common (braindead, but
 | 
|
137  | 
            # common)
 | 
|
138  | 
self.send_response(301)  | 
|
139  | 
self.send_header("Location", self.path + "/")  | 
|
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
140  | 
            # Indicates that the body is empty for HTTP/1.1 clients
 | 
| 
3111.1.23
by Vincent Ladeuil
 Make HTTP/1.1 the default implementation reveals one more bug.  | 
141  | 
self.send_header('Content-Length', '0')  | 
142  | 
self.end_headers()  | 
|
143  | 
return None  | 
|
144  | 
||
145  | 
return SimpleHTTPServer.SimpleHTTPRequestHandler.send_head(self)  | 
|
146  | 
||
| 
2004.1.25
by v.ladeuil+lp at free
 Shuffle http related test code. Hopefully it ends up at the right place :)  | 
147  | 
def send_range_content(self, file, start, length):  | 
148  | 
file.seek(start)  | 
|
149  | 
self.wfile.write(file.read(length))  | 
|
150  | 
||
151  | 
def get_single_range(self, file, file_size, start, end):  | 
|
152  | 
self.send_response(206)  | 
|
153  | 
length = end - start + 1  | 
|
154  | 
self.send_header('Accept-Ranges', 'bytes')  | 
|
155  | 
self.send_header("Content-Length", "%d" % length)  | 
|
156  | 
||
157  | 
self.send_header("Content-Type", 'application/octet-stream')  | 
|
158  | 
self.send_header("Content-Range", "bytes %d-%d/%d" % (start,  | 
|
159  | 
end,  | 
|
160  | 
file_size))  | 
|
161  | 
self.end_headers()  | 
|
162  | 
self.send_range_content(file, start, length)  | 
|
163  | 
||
164  | 
def get_multiple_ranges(self, file, file_size, ranges):  | 
|
165  | 
self.send_response(206)  | 
|
166  | 
self.send_header('Accept-Ranges', 'bytes')  | 
|
| 
3111.1.28
by Vincent Ladeuil
 Fix the multi-ranges http server and add tests.  | 
167  | 
boundary = '%d' % random.randint(0,0x7FFFFFFF)  | 
168  | 
self.send_header('Content-Type',  | 
|
169  | 
'multipart/byteranges; boundary=%s' % boundary)  | 
|
170  | 
boundary_line = '--%s\r\n' % boundary  | 
|
171  | 
        # Calculate the Content-Length
 | 
|
172  | 
content_length = 0  | 
|
173  | 
for (start, end) in ranges:  | 
|
174  | 
content_length += len(boundary_line)  | 
|
175  | 
content_length += self._header_line_length(  | 
|
176  | 
'Content-type', 'application/octet-stream')  | 
|
177  | 
content_length += self._header_line_length(  | 
|
178  | 
'Content-Range', 'bytes %d-%d/%d' % (start, end, file_size))  | 
|
179  | 
content_length += len('\r\n') # end headers  | 
|
| 
2929.3.19
by Vincent Ladeuil
 Fix 1.1 related bugs in HTTP server, add HTTPS passing tests (by temporarily disabling pycurl certificate verification).  | 
180  | 
content_length += end - start + 1  | 
| 
3111.1.28
by Vincent Ladeuil
 Fix the multi-ranges http server and add tests.  | 
181  | 
content_length += len(boundary_line)  | 
182  | 
self.send_header('Content-length', content_length)  | 
|
| 
2004.1.25
by v.ladeuil+lp at free
 Shuffle http related test code. Hopefully it ends up at the right place :)  | 
183  | 
self.end_headers()  | 
| 
3111.1.28
by Vincent Ladeuil
 Fix the multi-ranges http server and add tests.  | 
184  | 
|
185  | 
        # Send the multipart body
 | 
|
| 
2004.1.25
by v.ladeuil+lp at free
 Shuffle http related test code. Hopefully it ends up at the right place :)  | 
186  | 
for (start, end) in ranges:  | 
| 
3111.1.28
by Vincent Ladeuil
 Fix the multi-ranges http server and add tests.  | 
187  | 
self.wfile.write(boundary_line)  | 
188  | 
self.send_header('Content-type', 'application/octet-stream')  | 
|
189  | 
self.send_header('Content-Range', 'bytes %d-%d/%d'  | 
|
190  | 
% (start, end, file_size))  | 
|
| 
2004.1.25
by v.ladeuil+lp at free
 Shuffle http related test code. Hopefully it ends up at the right place :)  | 
191  | 
self.end_headers()  | 
192  | 
self.send_range_content(file, start, end - start + 1)  | 
|
| 
3059.2.12
by Vincent Ladeuil
 Spiv review feedback.  | 
193  | 
        # Final boundary
 | 
| 
3111.1.28
by Vincent Ladeuil
 Fix the multi-ranges http server and add tests.  | 
194  | 
self.wfile.write(boundary_line)  | 
| 
2004.1.25
by v.ladeuil+lp at free
 Shuffle http related test code. Hopefully it ends up at the right place :)  | 
195  | 
|
196  | 
def do_GET(self):  | 
|
197  | 
"""Serve a GET request.  | 
|
198  | 
||
199  | 
        Handles the Range header.
 | 
|
200  | 
        """
 | 
|
| 
3052.3.2
by Vincent Ladeuil
 Add tests and fix trivial bugs and other typos.  | 
201  | 
        # Update statistics
 | 
202  | 
self.server.test_case_server.GET_request_nb += 1  | 
|
| 
2004.1.25
by v.ladeuil+lp at free
 Shuffle http related test code. Hopefully it ends up at the right place :)  | 
203  | 
|
204  | 
path = self.translate_path(self.path)  | 
|
205  | 
ranges_header_value = self.headers.get('Range')  | 
|
206  | 
if ranges_header_value is None or os.path.isdir(path):  | 
|
207  | 
            # Let the mother class handle most cases
 | 
|
| 
3111.1.2
by Vincent Ladeuil
 Preparatory cleanup.  | 
208  | 
return SimpleHTTPServer.SimpleHTTPRequestHandler.do_GET(self)  | 
| 
2004.1.25
by v.ladeuil+lp at free
 Shuffle http related test code. Hopefully it ends up at the right place :)  | 
209  | 
|
210  | 
try:  | 
|
211  | 
            # Always read in binary mode. Opening files in text
 | 
|
212  | 
            # mode may cause newline translations, making the
 | 
|
213  | 
            # actual size of the content transmitted *less* than
 | 
|
214  | 
            # the content-length!
 | 
|
215  | 
file = open(path, 'rb')  | 
|
216  | 
except IOError:  | 
|
217  | 
self.send_error(404, "File not found")  | 
|
| 
2000.3.9
by v.ladeuil+lp at free
 The tests that would have help avoid bug #73948 and all that mess :)  | 
218  | 
            return
 | 
| 
2004.1.25
by v.ladeuil+lp at free
 Shuffle http related test code. Hopefully it ends up at the right place :)  | 
219  | 
|
220  | 
file_size = os.fstat(file.fileno())[6]  | 
|
221  | 
tail, ranges = self.parse_ranges(ranges_header_value)  | 
|
222  | 
        # Normalize tail into ranges
 | 
|
223  | 
if tail != 0:  | 
|
224  | 
ranges.append((file_size - tail, file_size))  | 
|
225  | 
||
| 
2182.2.2
by v.ladeuil+lp at free
 Thanks again to Aaron, the http server RFC2616 compliance  | 
226  | 
self._satisfiable_ranges = True  | 
| 
2004.1.25
by v.ladeuil+lp at free
 Shuffle http related test code. Hopefully it ends up at the right place :)  | 
227  | 
if len(ranges) == 0:  | 
| 
2182.2.2
by v.ladeuil+lp at free
 Thanks again to Aaron, the http server RFC2616 compliance  | 
228  | 
self._satisfiable_ranges = False  | 
| 
2004.1.25
by v.ladeuil+lp at free
 Shuffle http related test code. Hopefully it ends up at the right place :)  | 
229  | 
else:  | 
| 
2182.2.1
by v.ladeuil+lp at free
 Aaron was right. Thanks to him, the http server RFC2616 compliance  | 
230  | 
def check_range(range_specifier):  | 
231  | 
start, end = range_specifier  | 
|
| 
2182.2.2
by v.ladeuil+lp at free
 Thanks again to Aaron, the http server RFC2616 compliance  | 
232  | 
                # RFC2616 14.35, ranges are invalid if start >= file_size
 | 
233  | 
if start >= file_size:  | 
|
234  | 
self._satisfiable_ranges = False # Side-effect !  | 
|
| 
2182.2.1
by v.ladeuil+lp at free
 Aaron was right. Thanks to him, the http server RFC2616 compliance  | 
235  | 
return 0, 0  | 
236  | 
                # RFC2616 14.35, end values should be truncated
 | 
|
237  | 
                # to file_size -1 if they exceed it
 | 
|
238  | 
end = min(end, file_size - 1)  | 
|
239  | 
return start, end  | 
|
240  | 
||
241  | 
ranges = map(check_range, ranges)  | 
|
242  | 
||
| 
2182.2.2
by v.ladeuil+lp at free
 Thanks again to Aaron, the http server RFC2616 compliance  | 
243  | 
if not self._satisfiable_ranges:  | 
| 
2182.2.1
by v.ladeuil+lp at free
 Aaron was right. Thanks to him, the http server RFC2616 compliance  | 
244  | 
            # RFC2616 14.16 and 14.35 says that when a server
 | 
245  | 
            # encounters unsatisfiable range specifiers, it
 | 
|
246  | 
            # SHOULD return a 416.
 | 
|
| 
2000.3.9
by v.ladeuil+lp at free
 The tests that would have help avoid bug #73948 and all that mess :)  | 
247  | 
file.close()  | 
| 
2182.2.1
by v.ladeuil+lp at free
 Aaron was right. Thanks to him, the http server RFC2616 compliance  | 
248  | 
            # FIXME: We SHOULD send a Content-Range header too,
 | 
249  | 
            # but the implementation of send_error does not
 | 
|
250  | 
            # allows that. So far.
 | 
|
| 
2000.3.9
by v.ladeuil+lp at free
 The tests that would have help avoid bug #73948 and all that mess :)  | 
251  | 
self.send_error(416, "Requested range not satisfiable")  | 
252  | 
            return
 | 
|
| 
2004.1.25
by v.ladeuil+lp at free
 Shuffle http related test code. Hopefully it ends up at the right place :)  | 
253  | 
|
254  | 
if len(ranges) == 1:  | 
|
255  | 
(start, end) = ranges[0]  | 
|
256  | 
self.get_single_range(file, file_size, start, end)  | 
|
257  | 
else:  | 
|
258  | 
self.get_multiple_ranges(file, file_size, ranges)  | 
|
259  | 
file.close()  | 
|
260  | 
||
| 
2420.1.9
by Vincent Ladeuil
 Refactor proxy and auth test classes. Tests failing for digest auth.  | 
261  | 
def translate_path(self, path):  | 
262  | 
"""Translate a /-separated PATH to the local filename syntax.  | 
|
263  | 
||
264  | 
        If the server requires it, proxy the path before the usual translation
 | 
|
265  | 
        """
 | 
|
266  | 
if self.server.test_case_server.proxy_requests:  | 
|
267  | 
            # We need to act as a proxy and accept absolute urls,
 | 
|
268  | 
            # which SimpleHTTPRequestHandler (parent) is not
 | 
|
269  | 
            # ready for. So we just drop the protocol://host:port
 | 
|
270  | 
            # part in front of the request-url (because we know
 | 
|
271  | 
            # we would not forward the request to *another*
 | 
|
272  | 
            # proxy).
 | 
|
273  | 
||
274  | 
            # So we do what SimpleHTTPRequestHandler.translate_path
 | 
|
275  | 
            # do beginning with python 2.4.3: abandon query
 | 
|
276  | 
            # parameters, scheme, host port, etc (which ensure we
 | 
|
277  | 
            # provide the right behaviour on all python versions).
 | 
|
278  | 
path = urlparse.urlparse(path)[2]  | 
|
279  | 
            # And now, we can apply *our* trick to proxy files
 | 
|
280  | 
path += '-proxied'  | 
|
281  | 
||
282  | 
return self._translate_path(path)  | 
|
283  | 
||
284  | 
def _translate_path(self, path):  | 
|
| 
3221.11.13
by Robert Collins
 Allow push --shallow to just work, and fix the testing HTTPServer to not be affected by chdir() calls.  | 
285  | 
"""Translate a /-separated PATH to the local filename syntax.  | 
286  | 
||
| 
3221.9.5
by Ian Clatworthy
 some tweaks from abentley's earlier review feedback  | 
287  | 
        Note that we're translating http URLs here, not file URLs.
 | 
288  | 
        The URL root location is the server's startup directory.
 | 
|
| 
3221.11.13
by Robert Collins
 Allow push --shallow to just work, and fix the testing HTTPServer to not be affected by chdir() calls.  | 
289  | 
        Components that mean special things to the local file system
 | 
290  | 
        (e.g. drive or directory names) are ignored.  (XXX They should
 | 
|
291  | 
        probably be diagnosed.)
 | 
|
292  | 
||
293  | 
        Override from python standard library to stop it calling os.getcwd()
 | 
|
294  | 
        """
 | 
|
295  | 
        # abandon query parameters
 | 
|
296  | 
path = urlparse.urlparse(path)[2]  | 
|
297  | 
path = posixpath.normpath(urllib.unquote(path))  | 
|
| 
3221.9.4
by Ian Clatworthy
 fix failing unicode_paths test  | 
298  | 
path = path.decode('utf-8')  | 
| 
3221.11.13
by Robert Collins
 Allow push --shallow to just work, and fix the testing HTTPServer to not be affected by chdir() calls.  | 
299  | 
words = path.split('/')  | 
300  | 
words = filter(None, words)  | 
|
301  | 
path = self._cwd  | 
|
| 
3221.9.5
by Ian Clatworthy
 some tweaks from abentley's earlier review feedback  | 
302  | 
for num, word in enumerate(words):  | 
303  | 
if num == 0:  | 
|
304  | 
drive, word = os.path.splitdrive(word)  | 
|
| 
3221.11.13
by Robert Collins
 Allow push --shallow to just work, and fix the testing HTTPServer to not be affected by chdir() calls.  | 
305  | 
head, word = os.path.split(word)  | 
306  | 
if word in (os.curdir, os.pardir): continue  | 
|
307  | 
path = os.path.join(path, word)  | 
|
308  | 
return path  | 
|
| 
2420.1.9
by Vincent Ladeuil
 Refactor proxy and auth test classes. Tests failing for digest auth.  | 
309  | 
|
| 
2004.1.25
by v.ladeuil+lp at free
 Shuffle http related test code. Hopefully it ends up at the right place :)  | 
310  | 
|
| 
3111.1.22
by Vincent Ladeuil
 Rework TestingHTTPServer classes, fix test bug.  | 
311  | 
class TestingHTTPServerMixin:  | 
312  | 
||
313  | 
def __init__(self, test_case_server):  | 
|
| 
2164.2.28
by Vincent Ladeuil
 TestingHTTPServer.test_case_server renamed from test_case to avoid confusions.  | 
314  | 
        # test_case_server can be used to communicate between the
 | 
| 
2164.2.29
by Vincent Ladeuil
 Test the http redirection at the request level even if it's not  | 
315  | 
        # tests and the server (or the request handler and the
 | 
316  | 
        # server), allowing dynamic behaviors to be defined from
 | 
|
317  | 
        # the tests cases.
 | 
|
| 
3111.1.22
by Vincent Ladeuil
 Rework TestingHTTPServer classes, fix test bug.  | 
318  | 
self.test_case_server = test_case_server  | 
| 
3221.11.13
by Robert Collins
 Allow push --shallow to just work, and fix the testing HTTPServer to not be affected by chdir() calls.  | 
319  | 
self._home_dir = test_case_server._home_dir  | 
| 
3111.1.22
by Vincent Ladeuil
 Rework TestingHTTPServer classes, fix test bug.  | 
320  | 
|
321  | 
def tearDown(self):  | 
|
| 
3111.1.3
by Vincent Ladeuil
 Rework http test servers classes. Both 1.0 and 1.1 passing tests (1.1 forced manually).  | 
322  | 
"""Called to clean-up the server.  | 
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
323  | 
|
| 
3111.1.3
by Vincent Ladeuil
 Rework http test servers classes. Both 1.0 and 1.1 passing tests (1.1 forced manually).  | 
324  | 
         Since the server may be (surely is, even) in a blocking listen, we
 | 
325  | 
         shutdown its socket before closing it.
 | 
|
326  | 
         """
 | 
|
327  | 
         # Note that is this executed as part of the implicit tear down in the
 | 
|
328  | 
         # main thread while the server runs in its own thread. The clean way
 | 
|
| 
3111.1.22
by Vincent Ladeuil
 Rework TestingHTTPServer classes, fix test bug.  | 
329  | 
         # to tear down the server is to instruct him to stop accepting
 | 
330  | 
         # connections and wait for the current connection(s) to end
 | 
|
331  | 
         # naturally. To end the connection naturally, the http transports
 | 
|
332  | 
         # should close their socket when they do not need to talk to the
 | 
|
333  | 
         # server anymore. This happens naturally during the garbage collection
 | 
|
334  | 
         # phase of the test transport objetcs (the server clients), so we
 | 
|
335  | 
         # don't have to worry about them.  So, for the server, we must tear
 | 
|
336  | 
         # down here, from the main thread, when the test have ended.  Note
 | 
|
337  | 
         # that since the server is in a blocking operation and since python
 | 
|
338  | 
         # use select internally, shutting down the socket is reliable and
 | 
|
339  | 
         # relatively clean.
 | 
|
| 
3111.1.31
by Vincent Ladeuil
 Review feeback.  | 
340  | 
try:  | 
341  | 
self.socket.shutdown(socket.SHUT_RDWR)  | 
|
342  | 
except socket.error, e:  | 
|
343  | 
             # WSAENOTCONN (10057) 'Socket is not connected' is harmless on
 | 
|
344  | 
             # windows (occurs before the first connection attempt
 | 
|
345  | 
             # vila--20071230)
 | 
|
| 
3815.2.3
by Martin Pool
 merge fix for #293054, ssl on python2.6  | 
346  | 
|
347  | 
             # 'Socket is not connected' can also occur on OSX, with a
 | 
|
348  | 
             # "regular" ENOTCONN (when something went wrong during test case
 | 
|
349  | 
             # setup leading to self.setUp() *not* being called but
 | 
|
350  | 
             # self.tearDown() still being called -- vila20081106
 | 
|
351  | 
if not len(e.args) or e.args[0] not in (errno.ENOTCONN, 10057):  | 
|
| 
3111.1.31
by Vincent Ladeuil
 Review feeback.  | 
352  | 
                 raise
 | 
| 
3111.1.3
by Vincent Ladeuil
 Rework http test servers classes. Both 1.0 and 1.1 passing tests (1.1 forced manually).  | 
353  | 
         # Let the server properly close the socket
 | 
| 
3111.1.22
by Vincent Ladeuil
 Rework TestingHTTPServer classes, fix test bug.  | 
354  | 
self.server_close()  | 
| 
3111.1.3
by Vincent Ladeuil
 Rework http test servers classes. Both 1.0 and 1.1 passing tests (1.1 forced manually).  | 
355  | 
|
| 
3221.11.13
by Robert Collins
 Allow push --shallow to just work, and fix the testing HTTPServer to not be affected by chdir() calls.  | 
356  | 
|
| 
3111.1.22
by Vincent Ladeuil
 Rework TestingHTTPServer classes, fix test bug.  | 
357  | 
class TestingHTTPServer(SocketServer.TCPServer, TestingHTTPServerMixin):  | 
| 
3111.1.3
by Vincent Ladeuil
 Rework http test servers classes. Both 1.0 and 1.1 passing tests (1.1 forced manually).  | 
358  | 
|
| 
3111.1.30
by Vincent Ladeuil
 Update NEWS. Some cosmetic changes.  | 
359  | 
def __init__(self, server_address, request_handler_class,  | 
360  | 
test_case_server):  | 
|
| 
3111.1.22
by Vincent Ladeuil
 Rework TestingHTTPServer classes, fix test bug.  | 
361  | 
TestingHTTPServerMixin.__init__(self, test_case_server)  | 
362  | 
SocketServer.TCPServer.__init__(self, server_address,  | 
|
363  | 
request_handler_class)  | 
|
364  | 
||
365  | 
||
366  | 
class TestingThreadingHTTPServer(SocketServer.ThreadingTCPServer,  | 
|
367  | 
TestingHTTPServerMixin):  | 
|
| 
3111.1.3
by Vincent Ladeuil
 Rework http test servers classes. Both 1.0 and 1.1 passing tests (1.1 forced manually).  | 
368  | 
"""A threading HTTP test server for HTTP 1.1.  | 
369  | 
||
370  | 
    Since tests can initiate several concurrent connections to the same http
 | 
|
371  | 
    server, we need an independent connection for each of them. We achieve that
 | 
|
372  | 
    by spawning a new thread for each connection.
 | 
|
373  | 
    """
 | 
|
374  | 
||
| 
3111.1.30
by Vincent Ladeuil
 Update NEWS. Some cosmetic changes.  | 
375  | 
def __init__(self, server_address, request_handler_class,  | 
376  | 
test_case_server):  | 
|
| 
3111.1.22
by Vincent Ladeuil
 Rework TestingHTTPServer classes, fix test bug.  | 
377  | 
TestingHTTPServerMixin.__init__(self, test_case_server)  | 
378  | 
SocketServer.ThreadingTCPServer.__init__(self, server_address,  | 
|
379  | 
request_handler_class)  | 
|
| 
3111.1.3
by Vincent Ladeuil
 Rework http test servers classes. Both 1.0 and 1.1 passing tests (1.1 forced manually).  | 
380  | 
        # Decides how threads will act upon termination of the main
 | 
381  | 
        # process. This is prophylactic as we should not leave the threads
 | 
|
382  | 
        # lying around.
 | 
|
| 
3111.1.22
by Vincent Ladeuil
 Rework TestingHTTPServer classes, fix test bug.  | 
383  | 
self.daemon_threads = True  | 
| 
2953.2.1
by Vincent Ladeuil
 Fix #158972 by not using timeout for HttpServer.  | 
384  | 
|
| 
2004.1.25
by v.ladeuil+lp at free
 Shuffle http related test code. Hopefully it ends up at the right place :)  | 
385  | 
|
| 
3111.1.2
by Vincent Ladeuil
 Preparatory cleanup.  | 
386  | 
class HttpServer(transport.Server):  | 
| 
2004.1.25
by v.ladeuil+lp at free
 Shuffle http related test code. Hopefully it ends up at the right place :)  | 
387  | 
"""A test server for http transports.  | 
388  | 
||
389  | 
    Subclasses can provide a specific request handler.
 | 
|
390  | 
    """
 | 
|
391  | 
||
| 
3111.1.4
by Vincent Ladeuil
 Select the server depending on the request handler protocol. Add tests.  | 
392  | 
    # The real servers depending on the protocol
 | 
393  | 
http_server_class = {'HTTP/1.0': TestingHTTPServer,  | 
|
394  | 
'HTTP/1.1': TestingThreadingHTTPServer,  | 
|
395  | 
                         }
 | 
|
396  | 
||
| 
2420.1.9
by Vincent Ladeuil
 Refactor proxy and auth test classes. Tests failing for digest auth.  | 
397  | 
    # Whether or not we proxy the requests (see
 | 
398  | 
    # TestingHTTPRequestHandler.translate_path).
 | 
|
399  | 
proxy_requests = False  | 
|
400  | 
||
| 
2004.1.25
by v.ladeuil+lp at free
 Shuffle http related test code. Hopefully it ends up at the right place :)  | 
401  | 
    # used to form the url that connects to this server
 | 
402  | 
_url_protocol = 'http'  | 
|
403  | 
||
| 
3111.1.15
by Vincent Ladeuil
 Provide a way to specify the protocol version at the server layer.  | 
404  | 
def __init__(self, request_handler=TestingHTTPRequestHandler,  | 
405  | 
protocol_version=None):  | 
|
406  | 
"""Constructor.  | 
|
407  | 
||
408  | 
        :param request_handler: a class that will be instantiated to handle an
 | 
|
409  | 
            http connection (one or several requests).
 | 
|
410  | 
||
411  | 
        :param protocol_version: if specified, will override the protocol
 | 
|
412  | 
            version of the request handler.
 | 
|
413  | 
        """
 | 
|
| 
3111.1.2
by Vincent Ladeuil
 Preparatory cleanup.  | 
414  | 
transport.Server.__init__(self)  | 
| 
2004.1.25
by v.ladeuil+lp at free
 Shuffle http related test code. Hopefully it ends up at the right place :)  | 
415  | 
self.request_handler = request_handler  | 
| 
2164.2.13
by v.ladeuil+lp at free
 Add tests for redirection. Preserve transport decorations.  | 
416  | 
self.host = 'localhost'  | 
417  | 
self.port = 0  | 
|
418  | 
self._httpd = None  | 
|
| 
3111.1.15
by Vincent Ladeuil
 Provide a way to specify the protocol version at the server layer.  | 
419  | 
self.protocol_version = protocol_version  | 
| 
3052.3.2
by Vincent Ladeuil
 Add tests and fix trivial bugs and other typos.  | 
420  | 
        # Allows tests to verify number of GET requests issued
 | 
421  | 
self.GET_request_nb = 0  | 
|
| 
2004.1.25
by v.ladeuil+lp at free
 Shuffle http related test code. Hopefully it ends up at the right place :)  | 
422  | 
|
| 
2929.3.19
by Vincent Ladeuil
 Fix 1.1 related bugs in HTTP server, add HTTPS passing tests (by temporarily disabling pycurl certificate verification).  | 
423  | 
def create_httpd(self, serv_cls, rhandler_cls):  | 
424  | 
return serv_cls((self.host, self.port), self.request_handler, self)  | 
|
| 
2929.3.12
by Vincent Ladeuil
 Implement an https server passing the same tests than http. Except  | 
425  | 
|
| 
3734.2.8
by Vincent Ladeuil
 Catch spurious exceptions (python-2.6) when SocketServer is shut down.  | 
426  | 
def __repr__(self):  | 
427  | 
return "%s(%s:%s)" % \  | 
|
428  | 
(self.__class__.__name__, self.host, self.port)  | 
|
429  | 
||
| 
2004.1.28
by v.ladeuil+lp at free
 Merge bzr.dev. Including http modifications by "smart" related code  | 
430  | 
def _get_httpd(self):  | 
| 
2164.2.13
by v.ladeuil+lp at free
 Add tests for redirection. Preserve transport decorations.  | 
431  | 
if self._httpd is None:  | 
| 
3111.1.4
by Vincent Ladeuil
 Select the server depending on the request handler protocol. Add tests.  | 
432  | 
rhandler = self.request_handler  | 
| 
3111.1.21
by Vincent Ladeuil
 Add some comments.  | 
433  | 
            # Depending on the protocol version, we will create the approriate
 | 
434  | 
            # server
 | 
|
| 
3111.1.15
by Vincent Ladeuil
 Provide a way to specify the protocol version at the server layer.  | 
435  | 
if self.protocol_version is None:  | 
| 
3111.1.21
by Vincent Ladeuil
 Add some comments.  | 
436  | 
                # Use the request handler one
 | 
| 
3111.1.15
by Vincent Ladeuil
 Provide a way to specify the protocol version at the server layer.  | 
437  | 
proto_vers = rhandler.protocol_version  | 
438  | 
else:  | 
|
| 
3111.1.21
by Vincent Ladeuil
 Add some comments.  | 
439  | 
                # Use our own, it will be used to override the request handler
 | 
440  | 
                # one too.
 | 
|
| 
3111.1.15
by Vincent Ladeuil
 Provide a way to specify the protocol version at the server layer.  | 
441  | 
proto_vers = self.protocol_version  | 
| 
3111.1.4
by Vincent Ladeuil
 Select the server depending on the request handler protocol. Add tests.  | 
442  | 
            # Create the appropriate server for the required protocol
 | 
443  | 
serv_cls = self.http_server_class.get(proto_vers, None)  | 
|
444  | 
if serv_cls is None:  | 
|
445  | 
raise httplib.UnknownProtocol(proto_vers)  | 
|
446  | 
else:  | 
|
| 
2929.3.19
by Vincent Ladeuil
 Fix 1.1 related bugs in HTTP server, add HTTPS passing tests (by temporarily disabling pycurl certificate verification).  | 
447  | 
self._httpd = self.create_httpd(serv_cls, rhandler)  | 
| 
2164.2.13
by v.ladeuil+lp at free
 Add tests for redirection. Preserve transport decorations.  | 
448  | 
host, self.port = self._httpd.socket.getsockname()  | 
449  | 
return self._httpd  | 
|
| 
2004.1.28
by v.ladeuil+lp at free
 Merge bzr.dev. Including http modifications by "smart" related code  | 
450  | 
|
| 
2004.1.25
by v.ladeuil+lp at free
 Shuffle http related test code. Hopefully it ends up at the right place :)  | 
451  | 
def _http_start(self):  | 
| 
3111.1.4
by Vincent Ladeuil
 Select the server depending on the request handler protocol. Add tests.  | 
452  | 
"""Server thread main entry point. """  | 
453  | 
self._http_running = False  | 
|
454  | 
try:  | 
|
455  | 
try:  | 
|
456  | 
httpd = self._get_httpd()  | 
|
457  | 
self._http_base_url = '%s://%s:%s/' % (self._url_protocol,  | 
|
458  | 
self.host, self.port)  | 
|
459  | 
self._http_running = True  | 
|
460  | 
except:  | 
|
461  | 
                # Whatever goes wrong, we save the exception for the main
 | 
|
462  | 
                # thread. Note that since we are running in a thread, no signal
 | 
|
463  | 
                # can be received, so we don't care about KeyboardInterrupt.
 | 
|
464  | 
self._http_exception = sys.exc_info()  | 
|
465  | 
finally:  | 
|
466  | 
            # Release the lock or the main thread will block and the whole
 | 
|
467  | 
            # process will hang.
 | 
|
468  | 
self._http_starting.release()  | 
|
| 
2004.1.25
by v.ladeuil+lp at free
 Shuffle http related test code. Hopefully it ends up at the right place :)  | 
469  | 
|
| 
3111.1.4
by Vincent Ladeuil
 Select the server depending on the request handler protocol. Add tests.  | 
470  | 
        # From now on, exceptions are taken care of by the
 | 
471  | 
        # SocketServer.BaseServer or the request handler.
 | 
|
| 
2004.1.25
by v.ladeuil+lp at free
 Shuffle http related test code. Hopefully it ends up at the right place :)  | 
472  | 
while self._http_running:  | 
473  | 
try:  | 
|
| 
3111.1.4
by Vincent Ladeuil
 Select the server depending on the request handler protocol. Add tests.  | 
474  | 
                # Really an HTTP connection but the python framework is generic
 | 
475  | 
                # and call them requests
 | 
|
| 
2004.1.25
by v.ladeuil+lp at free
 Shuffle http related test code. Hopefully it ends up at the right place :)  | 
476  | 
httpd.handle_request()  | 
477  | 
except socket.timeout:  | 
|
478  | 
                pass
 | 
|
| 
3734.2.8
by Vincent Ladeuil
 Catch spurious exceptions (python-2.6) when SocketServer is shut down.  | 
479  | 
except (socket.error, select.error), e:  | 
480  | 
if e[0] == errno.EBADF:  | 
|
481  | 
                   # Starting with python-2.6, handle_request may raise socket
 | 
|
482  | 
                   # or select exceptions when the server is shut down (as we
 | 
|
483  | 
                   # do).
 | 
|
484  | 
                   pass
 | 
|
485  | 
else:  | 
|
486  | 
                   raise
 | 
|
| 
2004.1.25
by v.ladeuil+lp at free
 Shuffle http related test code. Hopefully it ends up at the right place :)  | 
487  | 
|
488  | 
def _get_remote_url(self, path):  | 
|
489  | 
path_parts = path.split(os.path.sep)  | 
|
490  | 
if os.path.isabs(path):  | 
|
491  | 
if path_parts[:len(self._local_path_parts)] != \  | 
|
492  | 
self._local_path_parts:  | 
|
493  | 
raise BadWebserverPath(path, self.test_dir)  | 
|
494  | 
remote_path = '/'.join(path_parts[len(self._local_path_parts):])  | 
|
495  | 
else:  | 
|
496  | 
remote_path = '/'.join(path_parts)  | 
|
497  | 
||
498  | 
return self._http_base_url + remote_path  | 
|
499  | 
||
500  | 
def log(self, format, *args):  | 
|
501  | 
"""Capture Server log output."""  | 
|
502  | 
self.logs.append(format % args)  | 
|
503  | 
||
| 
2381.1.2
by Robert Collins
 Fixup the test changes made for hpss to be clean and self contained.  | 
504  | 
def setUp(self, backing_transport_server=None):  | 
| 
2018.5.42
by Robert Collins
 Various hopefully improvements, but wsgi is broken, handing over to spiv :).  | 
505  | 
"""See bzrlib.transport.Server.setUp.  | 
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
506  | 
|
| 
2381.1.2
by Robert Collins
 Fixup the test changes made for hpss to be clean and self contained.  | 
507  | 
        :param backing_transport_server: The transport that requests over this
 | 
| 
2018.5.42
by Robert Collins
 Various hopefully improvements, but wsgi is broken, handing over to spiv :).  | 
508  | 
            protocol should be forwarded to. Note that this is currently not
 | 
| 
2381.1.2
by Robert Collins
 Fixup the test changes made for hpss to be clean and self contained.  | 
509  | 
            supported for HTTP.
 | 
| 
2018.5.42
by Robert Collins
 Various hopefully improvements, but wsgi is broken, handing over to spiv :).  | 
510  | 
        """
 | 
| 
2381.1.2
by Robert Collins
 Fixup the test changes made for hpss to be clean and self contained.  | 
511  | 
        # XXX: TODO: make the server back onto vfs_server rather than local
 | 
512  | 
        # disk.
 | 
|
| 
3376.2.4
by Martin Pool
 Remove every assert statement from bzrlib!  | 
513  | 
if not (backing_transport_server is None or \  | 
514  | 
isinstance(backing_transport_server, local.LocalURLServer)):  | 
|
515  | 
raise AssertionError(  | 
|
516  | 
"HTTPServer currently assumes local transport, got %s" % \  | 
|
517  | 
backing_transport_server)  | 
|
| 
2004.1.25
by v.ladeuil+lp at free
 Shuffle http related test code. Hopefully it ends up at the right place :)  | 
518  | 
self._home_dir = os.getcwdu()  | 
519  | 
self._local_path_parts = self._home_dir.split(os.path.sep)  | 
|
| 
3111.1.4
by Vincent Ladeuil
 Select the server depending on the request handler protocol. Add tests.  | 
520  | 
self._http_base_url = None  | 
521  | 
||
| 
3111.1.6
by Vincent Ladeuil
 Begin refactoring test_http.py into parameterized tests.  | 
522  | 
        # Create the server thread
 | 
| 
2004.1.25
by v.ladeuil+lp at free
 Shuffle http related test code. Hopefully it ends up at the right place :)  | 
523  | 
self._http_starting = threading.Lock()  | 
524  | 
self._http_starting.acquire()  | 
|
525  | 
self._http_thread = threading.Thread(target=self._http_start)  | 
|
526  | 
self._http_thread.setDaemon(True)  | 
|
| 
3111.1.4
by Vincent Ladeuil
 Select the server depending on the request handler protocol. Add tests.  | 
527  | 
self._http_exception = None  | 
| 
2167.3.5
by v.ladeuil+lp at free
 Tests for proxies, covering #74759.  | 
528  | 
self._http_thread.start()  | 
| 
3111.1.4
by Vincent Ladeuil
 Select the server depending on the request handler protocol. Add tests.  | 
529  | 
|
| 
2167.3.6
by v.ladeuil+lp at free
 Take John's comments into account and add more tests.  | 
530  | 
        # Wait for the server thread to start (i.e release the lock)
 | 
531  | 
self._http_starting.acquire()  | 
|
| 
3111.1.4
by Vincent Ladeuil
 Select the server depending on the request handler protocol. Add tests.  | 
532  | 
|
533  | 
if self._http_exception is not None:  | 
|
| 
3111.1.21
by Vincent Ladeuil
 Add some comments.  | 
534  | 
            # Something went wrong during server start
 | 
| 
3111.1.4
by Vincent Ladeuil
 Select the server depending on the request handler protocol. Add tests.  | 
535  | 
exc_class, exc_value, exc_tb = self._http_exception  | 
536  | 
raise exc_class, exc_value, exc_tb  | 
|
| 
2167.3.6
by v.ladeuil+lp at free
 Take John's comments into account and add more tests.  | 
537  | 
self._http_starting.release()  | 
| 
2004.1.25
by v.ladeuil+lp at free
 Shuffle http related test code. Hopefully it ends up at the right place :)  | 
538  | 
self.logs = []  | 
539  | 
||
540  | 
def tearDown(self):  | 
|
541  | 
"""See bzrlib.transport.Server.tearDown."""  | 
|
| 
3111.1.22
by Vincent Ladeuil
 Rework TestingHTTPServer classes, fix test bug.  | 
542  | 
self._httpd.tearDown()  | 
| 
2004.1.25
by v.ladeuil+lp at free
 Shuffle http related test code. Hopefully it ends up at the right place :)  | 
543  | 
self._http_running = False  | 
| 
3111.1.28
by Vincent Ladeuil
 Fix the multi-ranges http server and add tests.  | 
544  | 
        # We don't need to 'self._http_thread.join()' here since the thread is
 | 
545  | 
        # a daemonic one and will be garbage collected anyway. Joining just
 | 
|
546  | 
        # slows us down for no added benefit.
 | 
|
| 
2004.1.25
by v.ladeuil+lp at free
 Shuffle http related test code. Hopefully it ends up at the right place :)  | 
547  | 
|
548  | 
def get_url(self):  | 
|
549  | 
"""See bzrlib.transport.Server.get_url."""  | 
|
550  | 
return self._get_remote_url(self._home_dir)  | 
|
551  | 
||
552  | 
def get_bogus_url(self):  | 
|
553  | 
"""See bzrlib.transport.Server.get_bogus_url."""  | 
|
554  | 
        # this is chosen to try to prevent trouble with proxies, weird dns,
 | 
|
555  | 
        # etc
 | 
|
| 
2929.3.10
by Vincent Ladeuil
 Add a fake https server and test facilities.  | 
556  | 
return self._url_protocol + '://127.0.0.1:1/'  | 
| 
2004.1.25
by v.ladeuil+lp at free
 Shuffle http related test code. Hopefully it ends up at the right place :)  | 
557  | 
|
558  | 
||
559  | 
class HttpServer_urllib(HttpServer):  | 
|
560  | 
"""Subclass of HttpServer that gives http+urllib urls.  | 
|
561  | 
||
562  | 
    This is for use in testing: connections to this server will always go
 | 
|
563  | 
    through urllib where possible.
 | 
|
564  | 
    """
 | 
|
565  | 
||
566  | 
    # urls returned by this server should require the urllib client impl
 | 
|
567  | 
_url_protocol = 'http+urllib'  | 
|
568  | 
||
569  | 
||
570  | 
class HttpServer_PyCurl(HttpServer):  | 
|
571  | 
"""Subclass of HttpServer that gives http+pycurl urls.  | 
|
572  | 
||
573  | 
    This is for use in testing: connections to this server will always go
 | 
|
574  | 
    through pycurl where possible.
 | 
|
575  | 
    """
 | 
|
576  | 
||
577  | 
    # We don't care about checking the pycurl availability as
 | 
|
578  | 
    # this server will be required only when pycurl is present
 | 
|
579  | 
||
580  | 
    # urls returned by this server should require the pycurl client impl
 | 
|
581  | 
_url_protocol = 'http+pycurl'  |