/brz/remove-bazaar

To get this branch, use:
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
4731.3.2 by Vincent Ladeuil
Reduce patch for review purposes.
33
from bzrlib import transport
3111.1.2 by Vincent Ladeuil
Preparatory cleanup.
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:
4731.2.3 by Vincent Ladeuil
Reduce the leaking http tests from ~200 to ~5.
80
            self._handle_one_request()
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
4731.2.3 by Vincent Ladeuil
Reduce the leaking http tests from ~200 to ~5.
91
    def _handle_one_request(self):
92
        SimpleHTTPServer.SimpleHTTPRequestHandler.handle_one_request(self)
93
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
94
    _range_regexp = re.compile(r'^(?P<start>\d+)-(?P<end>\d+)$')
95
    _tail_regexp = re.compile(r'^-(?P<tail>\d+)$')
96
97
    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
98
        """Parse the range header value and returns ranges and tail.
99
100
        RFC2616 14.35 says that syntactically invalid range
101
        specifiers MUST be ignored. In that case, we return 0 for
102
        tail and [] for ranges.
103
        """
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
104
        tail = 0
105
        ranges = []
2182.2.1 by v.ladeuil+lp at free
Aaron was right. Thanks to him, the http server RFC2616 compliance
106
        if not ranges_header.startswith('bytes='):
107
            # Syntactically invalid header
108
            return 0, []
109
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
110
        ranges_header = ranges_header[len('bytes='):]
111
        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
112
            # 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 :)
113
            range_match = self._range_regexp.match(range_str)
114
            if range_match is not None:
2182.2.2 by v.ladeuil+lp at free
Thanks again to Aaron, the http server RFC2616 compliance
115
                start = int(range_match.group('start'))
116
                end = int(range_match.group('end'))
117
                if start > end:
118
                    # Syntactically invalid range
119
                    return 0, []
120
                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 :)
121
            else:
122
                tail_match = self._tail_regexp.match(range_str)
123
                if tail_match is not None:
124
                    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
125
                else:
126
                    # Syntactically invalid range
127
                    return 0, []
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
128
        return tail, ranges
129
3111.1.28 by Vincent Ladeuil
Fix the multi-ranges http server and add tests.
130
    def _header_line_length(self, keyword, value):
131
        header_line = '%s: %s\r\n' % (keyword, value)
132
        return len(header_line)
133
3111.1.23 by Vincent Ladeuil
Make HTTP/1.1 the default implementation reveals one more bug.
134
    def send_head(self):
135
        """Overrides base implementation to work around a bug in python2.5."""
136
        path = self.translate_path(self.path)
137
        if os.path.isdir(path) and not self.path.endswith('/'):
138
            # redirect browser - doing basically what apache does when
139
            # DirectorySlash option is On which is quite common (braindead, but
140
            # common)
141
            self.send_response(301)
142
            self.send_header("Location", self.path + "/")
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
143
            # 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.
144
            self.send_header('Content-Length', '0')
145
            self.end_headers()
146
            return None
147
148
        return SimpleHTTPServer.SimpleHTTPRequestHandler.send_head(self)
149
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
150
    def send_range_content(self, file, start, length):
151
        file.seek(start)
152
        self.wfile.write(file.read(length))
153
154
    def get_single_range(self, file, file_size, start, end):
155
        self.send_response(206)
156
        length = end - start + 1
157
        self.send_header('Accept-Ranges', 'bytes')
158
        self.send_header("Content-Length", "%d" % length)
159
160
        self.send_header("Content-Type", 'application/octet-stream')
161
        self.send_header("Content-Range", "bytes %d-%d/%d" % (start,
162
                                                              end,
163
                                                              file_size))
164
        self.end_headers()
165
        self.send_range_content(file, start, length)
166
167
    def get_multiple_ranges(self, file, file_size, ranges):
168
        self.send_response(206)
169
        self.send_header('Accept-Ranges', 'bytes')
3111.1.28 by Vincent Ladeuil
Fix the multi-ranges http server and add tests.
170
        boundary = '%d' % random.randint(0,0x7FFFFFFF)
171
        self.send_header('Content-Type',
172
                         'multipart/byteranges; boundary=%s' % boundary)
173
        boundary_line = '--%s\r\n' % boundary
174
        # Calculate the Content-Length
175
        content_length = 0
176
        for (start, end) in ranges:
177
            content_length += len(boundary_line)
178
            content_length += self._header_line_length(
179
                'Content-type', 'application/octet-stream')
180
            content_length += self._header_line_length(
181
                'Content-Range', 'bytes %d-%d/%d' % (start, end, file_size))
182
            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).
183
            content_length += end - start + 1
3111.1.28 by Vincent Ladeuil
Fix the multi-ranges http server and add tests.
184
        content_length += len(boundary_line)
185
        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 :)
186
        self.end_headers()
3111.1.28 by Vincent Ladeuil
Fix the multi-ranges http server and add tests.
187
188
        # 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 :)
189
        for (start, end) in ranges:
3111.1.28 by Vincent Ladeuil
Fix the multi-ranges http server and add tests.
190
            self.wfile.write(boundary_line)
191
            self.send_header('Content-type', 'application/octet-stream')
192
            self.send_header('Content-Range', 'bytes %d-%d/%d'
193
                             % (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 :)
194
            self.end_headers()
195
            self.send_range_content(file, start, end - start + 1)
3059.2.12 by Vincent Ladeuil
Spiv review feedback.
196
        # Final boundary
3111.1.28 by Vincent Ladeuil
Fix the multi-ranges http server and add tests.
197
        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 :)
198
199
    def do_GET(self):
200
        """Serve a GET request.
201
202
        Handles the Range header.
203
        """
3052.3.2 by Vincent Ladeuil
Add tests and fix trivial bugs and other typos.
204
        # Update statistics
205
        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 :)
206
207
        path = self.translate_path(self.path)
208
        ranges_header_value = self.headers.get('Range')
209
        if ranges_header_value is None or os.path.isdir(path):
210
            # Let the mother class handle most cases
3111.1.2 by Vincent Ladeuil
Preparatory cleanup.
211
            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 :)
212
213
        try:
214
            # Always read in binary mode. Opening files in text
215
            # mode may cause newline translations, making the
216
            # actual size of the content transmitted *less* than
217
            # the content-length!
218
            file = open(path, 'rb')
219
        except IOError:
220
            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 :)
221
            return
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
222
223
        file_size = os.fstat(file.fileno())[6]
224
        tail, ranges = self.parse_ranges(ranges_header_value)
225
        # Normalize tail into ranges
226
        if tail != 0:
227
            ranges.append((file_size - tail, file_size))
228
2182.2.2 by v.ladeuil+lp at free
Thanks again to Aaron, the http server RFC2616 compliance
229
        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 :)
230
        if len(ranges) == 0:
2182.2.2 by v.ladeuil+lp at free
Thanks again to Aaron, the http server RFC2616 compliance
231
            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 :)
232
        else:
2182.2.1 by v.ladeuil+lp at free
Aaron was right. Thanks to him, the http server RFC2616 compliance
233
            def check_range(range_specifier):
234
                start, end = range_specifier
2182.2.2 by v.ladeuil+lp at free
Thanks again to Aaron, the http server RFC2616 compliance
235
                # RFC2616 14.35, ranges are invalid if start >= file_size
236
                if start >= file_size:
237
                    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
238
                    return 0, 0
239
                # RFC2616 14.35, end values should be truncated
240
                # to file_size -1 if they exceed it
241
                end = min(end, file_size - 1)
242
                return start, end
243
244
            ranges = map(check_range, ranges)
245
2182.2.2 by v.ladeuil+lp at free
Thanks again to Aaron, the http server RFC2616 compliance
246
        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
247
            # RFC2616 14.16 and 14.35 says that when a server
248
            # encounters unsatisfiable range specifiers, it
249
            # 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 :)
250
            file.close()
2182.2.1 by v.ladeuil+lp at free
Aaron was right. Thanks to him, the http server RFC2616 compliance
251
            # FIXME: We SHOULD send a Content-Range header too,
252
            # but the implementation of send_error does not
253
            # 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 :)
254
            self.send_error(416, "Requested range not satisfiable")
255
            return
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
256
257
        if len(ranges) == 1:
258
            (start, end) = ranges[0]
259
            self.get_single_range(file, file_size, start, end)
260
        else:
261
            self.get_multiple_ranges(file, file_size, ranges)
262
        file.close()
263
2420.1.9 by Vincent Ladeuil
Refactor proxy and auth test classes. Tests failing for digest auth.
264
    def translate_path(self, path):
265
        """Translate a /-separated PATH to the local filename syntax.
266
267
        If the server requires it, proxy the path before the usual translation
268
        """
269
        if self.server.test_case_server.proxy_requests:
270
            # We need to act as a proxy and accept absolute urls,
271
            # which SimpleHTTPRequestHandler (parent) is not
272
            # ready for. So we just drop the protocol://host:port
273
            # part in front of the request-url (because we know
274
            # we would not forward the request to *another*
275
            # proxy).
276
277
            # So we do what SimpleHTTPRequestHandler.translate_path
278
            # do beginning with python 2.4.3: abandon query
279
            # parameters, scheme, host port, etc (which ensure we
280
            # provide the right behaviour on all python versions).
281
            path = urlparse.urlparse(path)[2]
282
            # And now, we can apply *our* trick to proxy files
283
            path += '-proxied'
284
285
        return self._translate_path(path)
286
287
    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.
288
        """Translate a /-separated PATH to the local filename syntax.
289
3221.9.5 by Ian Clatworthy
some tweaks from abentley's earlier review feedback
290
        Note that we're translating http URLs here, not file URLs.
291
        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.
292
        Components that mean special things to the local file system
293
        (e.g. drive or directory names) are ignored.  (XXX They should
294
        probably be diagnosed.)
295
296
        Override from python standard library to stop it calling os.getcwd()
297
        """
298
        # abandon query parameters
299
        path = urlparse.urlparse(path)[2]
300
        path = posixpath.normpath(urllib.unquote(path))
3221.9.4 by Ian Clatworthy
fix failing unicode_paths test
301
        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.
302
        words = path.split('/')
303
        words = filter(None, words)
304
        path = self._cwd
3221.9.5 by Ian Clatworthy
some tweaks from abentley's earlier review feedback
305
        for num, word in enumerate(words):
306
            if num == 0:
307
                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.
308
            head, word = os.path.split(word)
309
            if word in (os.curdir, os.pardir): continue
310
            path = os.path.join(path, word)
311
        return path
2420.1.9 by Vincent Ladeuil
Refactor proxy and auth test classes. Tests failing for digest auth.
312
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
313
3111.1.22 by Vincent Ladeuil
Rework TestingHTTPServer classes, fix test bug.
314
class TestingHTTPServerMixin:
315
316
    def __init__(self, test_case_server):
2164.2.28 by Vincent Ladeuil
TestingHTTPServer.test_case_server renamed from test_case to avoid confusions.
317
        # 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
318
        # tests and the server (or the request handler and the
319
        # server), allowing dynamic behaviors to be defined from
320
        # the tests cases.
3111.1.22 by Vincent Ladeuil
Rework TestingHTTPServer classes, fix test bug.
321
        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.
322
        self._home_dir = test_case_server._home_dir
4731.2.2 by Vincent Ladeuil
Cleanup and refactor the server shutdown.
323
        self.serving = False
324
        self.is_shut_down = threading.Event()
325
4731.2.7 by Vincent Ladeuil
Refactor compatibility code for python-2.[45].
326
    def server_bind(self):
327
        # The following has been fixed in 2.5 so we need to provide it for
328
        # older python versions.
329
        if sys.version < (2, 5):
330
            self.server_address = self.socket.getsockname()
331
4731.2.2 by Vincent Ladeuil
Cleanup and refactor the server shutdown.
332
    def serve(self):
333
        self.serving = True
334
        self.is_shut_down.clear()
335
        while self.serving:
336
            try:
337
                # Really a connection but the python framework is generic and
338
                # call them requests
339
                self.handle_request()
340
            except socket.timeout:
341
                pass
342
            except (socket.error, select.error), e:
343
               if e[0] == errno.EBADF:
344
                   # Starting with python-2.6, handle_request may raise socket
345
                   # or select exceptions when the server is shut down as we
346
                   # do.
347
                   pass
348
               else:
349
                   raise
350
        # Let's close the listening socket
351
        self.server_close()
352
        self.is_shut_down.set()
353
4731.3.2 by Vincent Ladeuil
Reduce patch for review purposes.
354
    def connect_socket(self):
355
        msg = "getaddrinfo returns an empty list"
356
        for res in socket.getaddrinfo(*self.server_address):
357
            af, socktype, proto, canonname, sa = res
358
            sock = None
359
            try:
360
                sock = socket.socket(af, socktype, proto)
361
                sock.connect(sa)
362
                return sock
363
364
            except socket.error, msg:
365
                if sock is not None:
366
                    sock.close()
367
        raise socket.error, msg
368
4731.2.2 by Vincent Ladeuil
Cleanup and refactor the server shutdown.
369
    def shutdown(self):
370
        """Stops the serve() loop.
371
372
        Blocks until the loop has finished. This must be called while serve()
373
        is running in another thread, or it will deadlock.
374
        """
375
        if not self.serving:
376
            return
377
        self.serving = False
378
        # The server is listening for a last connection, let's give it:
379
        try:
4731.3.2 by Vincent Ladeuil
Reduce patch for review purposes.
380
            fake_conn = self.connect_socket()
4731.2.2 by Vincent Ladeuil
Cleanup and refactor the server shutdown.
381
            fake_conn.close()
382
        except socket.error, e:
383
            # But ignore connection errors as the point is to unblock the
384
            # server thread, it may happen that it's not blocked or even not
385
            # started (when something went wrong during test case setup
386
            # leading to self.setUp() *not* being called but self.tearDown()
387
            # still being called)
388
            pass
389
        self.is_shut_down.wait()
390
391
4731.2.3 by Vincent Ladeuil
Reduce the leaking http tests from ~200 to ~5.
392
    def shutdown_client(self, client_socket):
393
        """Properly shutdown a client socket.
394
395
        Under some circumstances (as in bug #383920), we need to force the
396
        shutdown as python delays it until gc occur otherwise and the client
397
        may hang.
398
399
        This should be called only when no other thread is trying to use the
400
        socket.
401
        """
402
        try:
403
            # The request process has been completed, the thread is about to
404
            # die, let's shutdown the socket if we can.
405
            client_socket.shutdown(socket.SHUT_RDWR)
406
        except (socket.error, select.error), e:
407
            if e[0] in (errno.EBADF, errno.ENOTCONN):
408
                # Right, the socket is already down
409
                pass
410
            else:
411
                raise
412
413
4731.2.2 by Vincent Ladeuil
Cleanup and refactor the server shutdown.
414
class TestingHTTPServer(TestingHTTPServerMixin, SocketServer.TCPServer):
3111.1.3 by Vincent Ladeuil
Rework http test servers classes. Both 1.0 and 1.1 passing tests (1.1 forced manually).
415
3111.1.30 by Vincent Ladeuil
Update NEWS. Some cosmetic changes.
416
    def __init__(self, server_address, request_handler_class,
417
                 test_case_server):
3111.1.22 by Vincent Ladeuil
Rework TestingHTTPServer classes, fix test bug.
418
        TestingHTTPServerMixin.__init__(self, test_case_server)
419
        SocketServer.TCPServer.__init__(self, server_address,
420
                                        request_handler_class)
421
4731.3.1 by Vincent Ladeuil
Fix python-2.4 compatibility.
422
    def server_bind(self):
423
        SocketServer.TCPServer.server_bind(self)
4731.2.7 by Vincent Ladeuil
Refactor compatibility code for python-2.[45].
424
        TestingHTTPServerMixin.server_bind(self)
4731.3.1 by Vincent Ladeuil
Fix python-2.4 compatibility.
425
3111.1.22 by Vincent Ladeuil
Rework TestingHTTPServer classes, fix test bug.
426
4731.2.2 by Vincent Ladeuil
Cleanup and refactor the server shutdown.
427
class TestingThreadingHTTPServer(TestingHTTPServerMixin,
428
                                 SocketServer.ThreadingTCPServer,
429
                                 ):
3111.1.3 by Vincent Ladeuil
Rework http test servers classes. Both 1.0 and 1.1 passing tests (1.1 forced manually).
430
    """A threading HTTP test server for HTTP 1.1.
431
432
    Since tests can initiate several concurrent connections to the same http
433
    server, we need an independent connection for each of them. We achieve that
434
    by spawning a new thread for each connection.
435
    """
436
3111.1.30 by Vincent Ladeuil
Update NEWS. Some cosmetic changes.
437
    def __init__(self, server_address, request_handler_class,
438
                 test_case_server):
3111.1.22 by Vincent Ladeuil
Rework TestingHTTPServer classes, fix test bug.
439
        TestingHTTPServerMixin.__init__(self, test_case_server)
440
        SocketServer.ThreadingTCPServer.__init__(self, server_address,
441
                                                 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).
442
        # Decides how threads will act upon termination of the main
443
        # process. This is prophylactic as we should not leave the threads
444
        # lying around.
3111.1.22 by Vincent Ladeuil
Rework TestingHTTPServer classes, fix test bug.
445
        self.daemon_threads = True
4731.2.3 by Vincent Ladeuil
Reduce the leaking http tests from ~200 to ~5.
446
        # We collect the sockets used by the clients to we can close them when
447
        # shutting down
448
        self.clients = []
2953.2.1 by Vincent Ladeuil
Fix #158972 by not using timeout for HttpServer.
449
4512.1.2 by Vincent Ladeuil
lifeless said: try harder :)
450
    def process_request_thread(self, request, client_address):
4731.2.6 by Vincent Ladeuil
Fix python-2.4/2.5 compatibility.
451
        self.clients.append((request, threading.currentThread()))
4512.1.2 by Vincent Ladeuil
lifeless said: try harder :)
452
        try:
4731.2.3 by Vincent Ladeuil
Reduce the leaking http tests from ~200 to ~5.
453
            SocketServer.ThreadingTCPServer.process_request_thread(
454
                self, request, client_address)
455
        except Exception, e:
456
            import pdb; pdb.set_trace()
457
458
        self.shutdown_client(request)
459
460
    def shutdown(self):
461
        TestingHTTPServerMixin.shutdown(self)
462
        # Let's close all our pending clients too
463
        for c, t in self.clients:
464
            self.shutdown_client(c)
465
            t.join()
4731.2.4 by Vincent Ladeuil
No more leaks in http tests.
466
            del t
4512.1.2 by Vincent Ladeuil
lifeless said: try harder :)
467
4731.3.1 by Vincent Ladeuil
Fix python-2.4 compatibility.
468
    def server_bind(self):
469
        SocketServer.ThreadingTCPServer.server_bind(self)
4731.2.7 by Vincent Ladeuil
Refactor compatibility code for python-2.[45].
470
        TestingHTTPServerMixin.server_bind(self)
4731.3.1 by Vincent Ladeuil
Fix python-2.4 compatibility.
471
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
472
3111.1.2 by Vincent Ladeuil
Preparatory cleanup.
473
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 :)
474
    """A test server for http transports.
475
476
    Subclasses can provide a specific request handler.
477
    """
478
3111.1.4 by Vincent Ladeuil
Select the server depending on the request handler protocol. Add tests.
479
    # The real servers depending on the protocol
480
    http_server_class = {'HTTP/1.0': TestingHTTPServer,
481
                         'HTTP/1.1': TestingThreadingHTTPServer,
482
                         }
483
2420.1.9 by Vincent Ladeuil
Refactor proxy and auth test classes. Tests failing for digest auth.
484
    # Whether or not we proxy the requests (see
485
    # TestingHTTPRequestHandler.translate_path).
486
    proxy_requests = False
487
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
488
    # used to form the url that connects to this server
489
    _url_protocol = 'http'
490
3111.1.15 by Vincent Ladeuil
Provide a way to specify the protocol version at the server layer.
491
    def __init__(self, request_handler=TestingHTTPRequestHandler,
492
                 protocol_version=None):
493
        """Constructor.
494
495
        :param request_handler: a class that will be instantiated to handle an
496
            http connection (one or several requests).
497
498
        :param protocol_version: if specified, will override the protocol
499
            version of the request handler.
500
        """
3111.1.2 by Vincent Ladeuil
Preparatory cleanup.
501
        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 :)
502
        self.request_handler = request_handler
2164.2.13 by v.ladeuil+lp at free
Add tests for redirection. Preserve transport decorations.
503
        self.host = 'localhost'
504
        self.port = 0
505
        self._httpd = None
3111.1.15 by Vincent Ladeuil
Provide a way to specify the protocol version at the server layer.
506
        self.protocol_version = protocol_version
3052.3.2 by Vincent Ladeuil
Add tests and fix trivial bugs and other typos.
507
        # Allows tests to verify number of GET requests issued
508
        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 :)
509
2929.3.19 by Vincent Ladeuil
Fix 1.1 related bugs in HTTP server, add HTTPS passing tests (by temporarily disabling pycurl certificate verification).
510
    def create_httpd(self, serv_cls, rhandler_cls):
511
        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
512
3734.2.8 by Vincent Ladeuil
Catch spurious exceptions (python-2.6) when SocketServer is shut down.
513
    def __repr__(self):
514
        return "%s(%s:%s)" % \
515
            (self.__class__.__name__, self.host, self.port)
516
2004.1.28 by v.ladeuil+lp at free
Merge bzr.dev. Including http modifications by "smart" related code
517
    def _get_httpd(self):
2164.2.13 by v.ladeuil+lp at free
Add tests for redirection. Preserve transport decorations.
518
        if self._httpd is None:
3111.1.4 by Vincent Ladeuil
Select the server depending on the request handler protocol. Add tests.
519
            rhandler = self.request_handler
3111.1.21 by Vincent Ladeuil
Add some comments.
520
            # Depending on the protocol version, we will create the approriate
521
            # server
3111.1.15 by Vincent Ladeuil
Provide a way to specify the protocol version at the server layer.
522
            if self.protocol_version is None:
3111.1.21 by Vincent Ladeuil
Add some comments.
523
                # Use the request handler one
3111.1.15 by Vincent Ladeuil
Provide a way to specify the protocol version at the server layer.
524
                proto_vers = rhandler.protocol_version
525
            else:
3111.1.21 by Vincent Ladeuil
Add some comments.
526
                # Use our own, it will be used to override the request handler
527
                # one too.
3111.1.15 by Vincent Ladeuil
Provide a way to specify the protocol version at the server layer.
528
                proto_vers = self.protocol_version
3111.1.4 by Vincent Ladeuil
Select the server depending on the request handler protocol. Add tests.
529
            # Create the appropriate server for the required protocol
530
            serv_cls = self.http_server_class.get(proto_vers, None)
531
            if serv_cls is None:
532
                raise httplib.UnknownProtocol(proto_vers)
533
            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).
534
                self._httpd = self.create_httpd(serv_cls, rhandler)
4731.2.2 by Vincent Ladeuil
Cleanup and refactor the server shutdown.
535
            # Ensure we get the right port
536
            host, self.port = self._httpd.server_address
2164.2.13 by v.ladeuil+lp at free
Add tests for redirection. Preserve transport decorations.
537
        return self._httpd
2004.1.28 by v.ladeuil+lp at free
Merge bzr.dev. Including http modifications by "smart" related code
538
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
539
    def _http_start(self):
3111.1.4 by Vincent Ladeuil
Select the server depending on the request handler protocol. Add tests.
540
        """Server thread main entry point. """
4731.2.2 by Vincent Ladeuil
Cleanup and refactor the server shutdown.
541
        server = None
3111.1.4 by Vincent Ladeuil
Select the server depending on the request handler protocol. Add tests.
542
        try:
543
            try:
4731.2.2 by Vincent Ladeuil
Cleanup and refactor the server shutdown.
544
                server = self._get_httpd()
3111.1.4 by Vincent Ladeuil
Select the server depending on the request handler protocol. Add tests.
545
                self._http_base_url = '%s://%s:%s/' % (self._url_protocol,
546
                                                       self.host, self.port)
547
            except:
548
                # Whatever goes wrong, we save the exception for the main
549
                # thread. Note that since we are running in a thread, no signal
550
                # can be received, so we don't care about KeyboardInterrupt.
551
                self._http_exception = sys.exc_info()
552
        finally:
553
            # Release the lock or the main thread will block and the whole
554
            # process will hang.
555
            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 :)
556
3111.1.4 by Vincent Ladeuil
Select the server depending on the request handler protocol. Add tests.
557
        # From now on, exceptions are taken care of by the
558
        # SocketServer.BaseServer or the request handler.
4731.2.2 by Vincent Ladeuil
Cleanup and refactor the server shutdown.
559
        if server is not None:
560
            server.serve()
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
561
562
    def _get_remote_url(self, path):
563
        path_parts = path.split(os.path.sep)
564
        if os.path.isabs(path):
565
            if path_parts[:len(self._local_path_parts)] != \
566
                   self._local_path_parts:
567
                raise BadWebserverPath(path, self.test_dir)
568
            remote_path = '/'.join(path_parts[len(self._local_path_parts):])
569
        else:
570
            remote_path = '/'.join(path_parts)
571
572
        return self._http_base_url + remote_path
573
574
    def log(self, format, *args):
575
        """Capture Server log output."""
576
        self.logs.append(format % args)
577
2381.1.2 by Robert Collins
Fixup the test changes made for hpss to be clean and self contained.
578
    def setUp(self, backing_transport_server=None):
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
579
        """See bzrlib.transport.Server.setUp.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
580
2381.1.2 by Robert Collins
Fixup the test changes made for hpss to be clean and self contained.
581
        :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 :).
582
            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.
583
            supported for HTTP.
2018.5.42 by Robert Collins
Various hopefully improvements, but wsgi is broken, handing over to spiv :).
584
        """
2381.1.2 by Robert Collins
Fixup the test changes made for hpss to be clean and self contained.
585
        # XXX: TODO: make the server back onto vfs_server rather than local
586
        # disk.
4731.2.1 by Vincent Ladeuil
Don't use shutdown() to stop http servers.
587
        if not (backing_transport_server is None
588
                or isinstance(backing_transport_server, local.LocalURLServer)):
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
589
            raise AssertionError(
4731.2.1 by Vincent Ladeuil
Don't use shutdown() to stop http servers.
590
                "HTTPServer currently assumes local transport, got %s" %
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
591
                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 :)
592
        self._home_dir = os.getcwdu()
593
        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.
594
        self._http_base_url = None
595
3111.1.6 by Vincent Ladeuil
Begin refactoring test_http.py into parameterized tests.
596
        # 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 :)
597
        self._http_starting = threading.Lock()
598
        self._http_starting.acquire()
599
        self._http_thread = threading.Thread(target=self._http_start)
600
        self._http_thread.setDaemon(True)
3111.1.4 by Vincent Ladeuil
Select the server depending on the request handler protocol. Add tests.
601
        self._http_exception = None
2167.3.5 by v.ladeuil+lp at free
Tests for proxies, covering #74759.
602
        self._http_thread.start()
3111.1.4 by Vincent Ladeuil
Select the server depending on the request handler protocol. Add tests.
603
2167.3.6 by v.ladeuil+lp at free
Take John's comments into account and add more tests.
604
        # Wait for the server thread to start (i.e release the lock)
605
        self._http_starting.acquire()
3111.1.4 by Vincent Ladeuil
Select the server depending on the request handler protocol. Add tests.
606
607
        if self._http_exception is not None:
3111.1.21 by Vincent Ladeuil
Add some comments.
608
            # Something went wrong during server start
3111.1.4 by Vincent Ladeuil
Select the server depending on the request handler protocol. Add tests.
609
            exc_class, exc_value, exc_tb = self._http_exception
610
            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.
611
        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 :)
612
        self.logs = []
613
614
    def tearDown(self):
615
        """See bzrlib.transport.Server.tearDown."""
4731.2.1 by Vincent Ladeuil
Don't use shutdown() to stop http servers.
616
        self._http_running = False
4731.2.2 by Vincent Ladeuil
Cleanup and refactor the server shutdown.
617
        self._httpd.shutdown()
4731.2.1 by Vincent Ladeuil
Don't use shutdown() to stop http servers.
618
        self._http_thread.join()
4731.2.4 by Vincent Ladeuil
No more leaks in http tests.
619
        del self._http_thread
620
        self._http_thread = None
2004.1.25 by v.ladeuil+lp at free
Shuffle http related test code. Hopefully it ends up at the right place :)
621
622
    def get_url(self):
623
        """See bzrlib.transport.Server.get_url."""
624
        return self._get_remote_url(self._home_dir)
625
626
    def get_bogus_url(self):
627
        """See bzrlib.transport.Server.get_bogus_url."""
628
        # this is chosen to try to prevent trouble with proxies, weird dns,
629
        # etc
2929.3.10 by Vincent Ladeuil
Add a fake https server and test facilities.
630
        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 :)
631
632
633
class HttpServer_urllib(HttpServer):
634
    """Subclass of HttpServer that gives http+urllib urls.
635
636
    This is for use in testing: connections to this server will always go
637
    through urllib where possible.
638
    """
639
640
    # urls returned by this server should require the urllib client impl
641
    _url_protocol = 'http+urllib'
642
643
644
class HttpServer_PyCurl(HttpServer):
645
    """Subclass of HttpServer that gives http+pycurl urls.
646
647
    This is for use in testing: connections to this server will always go
648
    through pycurl where possible.
649
    """
650
651
    # We don't care about checking the pycurl availability as
652
    # this server will be required only when pycurl is present
653
654
    # urls returned by this server should require the pycurl client impl
655
    _url_protocol = 'http+pycurl'