/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
5247.1.1 by Vincent Ladeuil
Merge previous attempt into current trunk
1
# Copyright (C) 2010 Canonical Ltd
5017.3.1 by Vincent Ladeuil
Create a tests.test_server.TestServer class out of transport.Server (while retaining the later for some special non-tests usages).
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
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
5247.3.13 by Vincent Ladeuil
Really test against a threading server and properly shutdown socket and threads.
17
import errno
5247.1.1 by Vincent Ladeuil
Merge previous attempt into current trunk
18
import socket
5247.3.8 by Vincent Ladeuil
Start implementing a TCP server running in its own thread (using
19
import SocketServer
5247.1.1 by Vincent Ladeuil
Merge previous attempt into current trunk
20
import select
5247.2.2 by Vincent Ladeuil
Implement a thread that can re-raise exceptions.
21
import sys
22
import threading
5247.1.1 by Vincent Ladeuil
Merge previous attempt into current trunk
23
24
5017.3.1 by Vincent Ladeuil
Create a tests.test_server.TestServer class out of transport.Server (while retaining the later for some special non-tests usages).
25
from bzrlib import (
5247.3.8 by Vincent Ladeuil
Start implementing a TCP server running in its own thread (using
26
    osutils,
5017.3.1 by Vincent Ladeuil
Create a tests.test_server.TestServer class out of transport.Server (while retaining the later for some special non-tests usages).
27
    transport,
5017.3.15 by Vincent Ladeuil
Fix missing import.
28
    urlutils,
5017.3.1 by Vincent Ladeuil
Create a tests.test_server.TestServer class out of transport.Server (while retaining the later for some special non-tests usages).
29
    )
5017.3.19 by Vincent Ladeuil
Move TestingPathFilteringServer to bzrlib.tests.test_server
30
from bzrlib.transport import (
5017.3.20 by Vincent Ladeuil
Move TestingChrootServer to bzrlib.tests.test_server
31
    chroot,
5017.3.19 by Vincent Ladeuil
Move TestingPathFilteringServer to bzrlib.tests.test_server
32
    pathfilter,
33
    )
5247.3.36 by Vincent Ladeuil
Start refactoring the smart server to control which thread it runs in.
34
from bzrlib.smart import (
35
    medium,
36
    server,
37
    )
5017.3.1 by Vincent Ladeuil
Create a tests.test_server.TestServer class out of transport.Server (while retaining the later for some special non-tests usages).
38
39
5247.5.17 by Vincent Ladeuil
Add some basic debug tracing controlled by -Ethreads.
40
def debug_threads():
41
    # FIXME: There is a dependency loop between bzrlib.tests and
42
    # bzrlib.tests.test_server that needs to be fixed. In the mean time
43
    # defining this function is enough for our needs. -- vila 20100611
44
    from bzrlib import tests
45
    return 'threads' in tests.selftest_debug_flags
46
47
5017.3.1 by Vincent Ladeuil
Create a tests.test_server.TestServer class out of transport.Server (while retaining the later for some special non-tests usages).
48
class TestServer(transport.Server):
49
    """A Transport Server dedicated to tests.
50
51
    The TestServer interface provides a server for a given transport. We use
52
    these servers as loopback testing tools. For any given transport the
53
    Servers it provides must either allow writing, or serve the contents
54
    of os.getcwdu() at the time start_server is called.
55
56
    Note that these are real servers - they must implement all the things
57
    that we want bzr transports to take advantage of.
58
    """
59
60
    def get_url(self):
61
        """Return a url for this server.
62
63
        If the transport does not represent a disk directory (i.e. it is
64
        a database like svn, or a memory only transport, it should return
65
        a connection to a newly established resource for this Server.
66
        Otherwise it should return a url that will provide access to the path
67
        that was os.getcwdu() when start_server() was called.
68
69
        Subsequent calls will return the same resource.
70
        """
71
        raise NotImplementedError
72
73
    def get_bogus_url(self):
74
        """Return a url for this protocol, that will fail to connect.
75
76
        This may raise NotImplementedError to indicate that this server cannot
77
        provide bogus urls.
78
        """
79
        raise NotImplementedError
80
81
5017.3.6 by Vincent Ladeuil
Fix some fallouts of moving test servers around.
82
class LocalURLServer(TestServer):
5017.3.3 by Vincent Ladeuil
Move LocalURLServer to bzrlib.tests.test_server
83
    """A pretend server for local transports, using file:// urls.
84
85
    Of course no actual server is required to access the local filesystem, so
86
    this just exists to tell the test code how to get to it.
87
    """
88
89
    def start_server(self):
90
        pass
91
92
    def get_url(self):
93
        """See Transport.Server.get_url."""
94
        return urlutils.local_path_to_url('')
95
96
5017.3.6 by Vincent Ladeuil
Fix some fallouts of moving test servers around.
97
class DecoratorServer(TestServer):
5017.3.2 by Vincent Ladeuil
Move DecoratorServer to test_server.py
98
    """Server for the TransportDecorator for testing with.
99
100
    To use this when subclassing TransportDecorator, override override the
101
    get_decorator_class method.
102
    """
103
104
    def start_server(self, server=None):
105
        """See bzrlib.transport.Server.start_server.
106
107
        :server: decorate the urls given by server. If not provided a
108
        LocalServer is created.
109
        """
110
        if server is not None:
111
            self._made_server = False
112
            self._server = server
113
        else:
114
            self._made_server = True
115
            self._server = LocalURLServer()
116
            self._server.start_server()
117
118
    def stop_server(self):
119
        if self._made_server:
120
            self._server.stop_server()
121
122
    def get_decorator_class(self):
123
        """Return the class of the decorators we should be constructing."""
124
        raise NotImplementedError(self.get_decorator_class)
125
126
    def get_url_prefix(self):
127
        """What URL prefix does this decorator produce?"""
128
        return self.get_decorator_class()._get_url_prefix()
129
130
    def get_bogus_url(self):
131
        """See bzrlib.transport.Server.get_bogus_url."""
132
        return self.get_url_prefix() + self._server.get_bogus_url()
133
134
    def get_url(self):
135
        """See bzrlib.transport.Server.get_url."""
136
        return self.get_url_prefix() + self._server.get_url()
137
138
5017.3.8 by Vincent Ladeuil
Move BrokenRenameServer to bzrlib.tests.test_server
139
class BrokenRenameServer(DecoratorServer):
140
    """Server for the BrokenRenameTransportDecorator for testing with."""
141
142
    def get_decorator_class(self):
143
        from bzrlib.transport import brokenrename
144
        return brokenrename.BrokenRenameTransportDecorator
145
146
5017.3.7 by Vincent Ladeuil
Move FakeNFSServer to bzrlib.tests.test_server
147
class FakeNFSServer(DecoratorServer):
148
    """Server for the FakeNFSTransportDecorator for testing with."""
149
150
    def get_decorator_class(self):
151
        from bzrlib.transport import fakenfs
152
        return fakenfs.FakeNFSTransportDecorator
153
154
5017.3.9 by Vincent Ladeuil
Move FakeVFATServer to bzrlib.tests.test_server
155
class FakeVFATServer(DecoratorServer):
156
    """A server that suggests connections through FakeVFATTransportDecorator
157
158
    For use in testing.
159
    """
160
161
    def get_decorator_class(self):
162
        from bzrlib.transport import fakevfat
5017.3.14 by Vincent Ladeuil
Fix some missing prefixes.
163
        return fakevfat.FakeVFATTransportDecorator
5017.3.9 by Vincent Ladeuil
Move FakeVFATServer to bzrlib.tests.test_server
164
165
5017.3.11 by Vincent Ladeuil
Move LogDecoratorServer to bzrlib.tests.test_server
166
class LogDecoratorServer(DecoratorServer):
167
    """Server for testing."""
168
169
    def get_decorator_class(self):
170
        from bzrlib.transport import log
171
        return log.TransportLogDecorator
172
173
5017.3.12 by Vincent Ladeuil
Move NoSmartTransportServer to bzrlib.tests.test_server
174
class NoSmartTransportServer(DecoratorServer):
175
    """Server for the NoSmartTransportDecorator for testing with."""
176
177
    def get_decorator_class(self):
178
        from bzrlib.transport import nosmart
5017.3.14 by Vincent Ladeuil
Fix some missing prefixes.
179
        return nosmart.NoSmartTransportDecorator
5017.3.12 by Vincent Ladeuil
Move NoSmartTransportServer to bzrlib.tests.test_server
180
181
5017.3.5 by Vincent Ladeuil
Move ReadonlyServer to bzrlib.tests.readonly
182
class ReadonlyServer(DecoratorServer):
183
    """Server for the ReadonlyTransportDecorator for testing with."""
184
185
    def get_decorator_class(self):
186
        from bzrlib.transport import readonly
187
        return readonly.ReadonlyTransportDecorator
188
189
5017.3.10 by Vincent Ladeuil
Move TraceServer to bzrlib.tests.test_server
190
class TraceServer(DecoratorServer):
191
    """Server for the TransportTraceDecorator for testing with."""
192
193
    def get_decorator_class(self):
194
        from bzrlib.transport import trace
5017.3.14 by Vincent Ladeuil
Fix some missing prefixes.
195
        return trace.TransportTraceDecorator
5017.3.10 by Vincent Ladeuil
Move TraceServer to bzrlib.tests.test_server
196
197
5017.3.13 by Vincent Ladeuil
Move UnlistableServer to bzrlib.tests.test_server
198
class UnlistableServer(DecoratorServer):
199
    """Server for the UnlistableTransportDecorator for testing with."""
200
201
    def get_decorator_class(self):
202
        from bzrlib.transport import unlistable
203
        return unlistable.UnlistableTransportDecorator
204
205
5017.3.19 by Vincent Ladeuil
Move TestingPathFilteringServer to bzrlib.tests.test_server
206
class TestingPathFilteringServer(pathfilter.PathFilteringServer):
207
208
    def __init__(self):
5017.3.20 by Vincent Ladeuil
Move TestingChrootServer to bzrlib.tests.test_server
209
        """TestingPathFilteringServer is not usable until start_server
210
        is called."""
5017.3.19 by Vincent Ladeuil
Move TestingPathFilteringServer to bzrlib.tests.test_server
211
212
    def start_server(self, backing_server=None):
213
        """Setup the Chroot on backing_server."""
214
        if backing_server is not None:
215
            self.backing_transport = transport.get_transport(
216
                backing_server.get_url())
217
        else:
218
            self.backing_transport = transport.get_transport('.')
219
        self.backing_transport.clone('added-by-filter').ensure_base()
220
        self.filter_func = lambda x: 'added-by-filter/' + x
221
        super(TestingPathFilteringServer, self).start_server()
222
5017.3.20 by Vincent Ladeuil
Move TestingChrootServer to bzrlib.tests.test_server
223
    def get_bogus_url(self):
224
        raise NotImplementedError
225
226
227
class TestingChrootServer(chroot.ChrootServer):
228
229
    def __init__(self):
230
        """TestingChrootServer is not usable until start_server is called."""
231
        super(TestingChrootServer, self).__init__(None)
232
233
    def start_server(self, backing_server=None):
234
        """Setup the Chroot on backing_server."""
235
        if backing_server is not None:
236
            self.backing_transport = transport.get_transport(
237
                backing_server.get_url())
238
        else:
239
            self.backing_transport = transport.get_transport('.')
240
        super(TestingChrootServer, self).start_server()
241
242
    def get_bogus_url(self):
243
        raise NotImplementedError
244
5017.3.19 by Vincent Ladeuil
Move TestingPathFilteringServer to bzrlib.tests.test_server
245
5247.2.2 by Vincent Ladeuil
Implement a thread that can re-raise exceptions.
246
class ThreadWithException(threading.Thread):
247
    """A catching exception thread.
248
249
    If an exception occurs during the thread execution, it's caught and
250
    re-raised when the thread is joined().
251
    """
252
253
    def __init__(self, *args, **kwargs):
5247.2.4 by Vincent Ladeuil
Add an event to ThreadWithException that can be shared with the calling thread.
254
        # There are cases where the calling thread must wait, yet, if an
5247.3.8 by Vincent Ladeuil
Start implementing a TCP server running in its own thread (using
255
        # exception occurs, the event should be set so the caller is not
5247.2.5 by Vincent Ladeuil
Some cleanups.
256
        # blocked. The main example is a calling thread that want to wait for
257
        # the called thread to be in a given state before continuing.
5247.2.4 by Vincent Ladeuil
Add an event to ThreadWithException that can be shared with the calling thread.
258
        try:
259
            event = kwargs.pop('event')
260
        except KeyError:
261
            # If the caller didn't pass a specific event, create our own
262
            event = threading.Event()
5247.2.2 by Vincent Ladeuil
Implement a thread that can re-raise exceptions.
263
        super(ThreadWithException, self).__init__(*args, **kwargs)
5247.3.10 by Vincent Ladeuil
Test errors during server life.
264
        self.set_event(event)
265
        self.exception = None
5247.5.4 by Vincent Ladeuil
Implement an execption handling mechanism that can be injected in ThreadWithException.
266
        self.ignored_exceptions = None # see set_ignored_exceptions
5247.3.10 by Vincent Ladeuil
Test errors during server life.
267
5247.5.18 by Vincent Ladeuil
Compatibility with python 2.5 and 2.4 for ThreadWithException.name.
268
    # compatibility thunk for python-2.4 and python-2.5...
5247.5.19 by Vincent Ladeuil
Cough, the compatibility thunk should not be installed for 2.6.
269
    if sys.version_info < (2, 6):
270
        name = property(threading.Thread.getName, threading.Thread.setName)
5247.5.18 by Vincent Ladeuil
Compatibility with python 2.5 and 2.4 for ThreadWithException.name.
271
5247.3.10 by Vincent Ladeuil
Test errors during server life.
272
    def set_event(self, event):
5247.2.5 by Vincent Ladeuil
Some cleanups.
273
        self.ready = event
5247.2.2 by Vincent Ladeuil
Implement a thread that can re-raise exceptions.
274
5247.5.4 by Vincent Ladeuil
Implement an execption handling mechanism that can be injected in ThreadWithException.
275
    def set_ignored_exceptions(self, ignored):
276
        """Declare which exceptions will be ignored.
277
278
        :param ignored: Can be either:
279
           - None: all exceptions will be raised,
280
           - an exception class: the instances of this class will be ignored,
281
           - a tuple of exception classes: the instances of any class of the
282
             list will be ignored,
5247.5.6 by Vincent Ladeuil
Just pass the exception object to simplify.
283
           - a callable: that will be passed the exception object
5247.5.4 by Vincent Ladeuil
Implement an execption handling mechanism that can be injected in ThreadWithException.
284
             and should return True if the exception should be ignored
285
        """
286
        if ignored is None:
287
            self.ignored_exceptions = None
5247.5.6 by Vincent Ladeuil
Just pass the exception object to simplify.
288
        elif isinstance(ignored, (Exception, tuple)):
289
            self.ignored_exceptions = lambda e: isinstance(e, ignored)
5247.5.4 by Vincent Ladeuil
Implement an execption handling mechanism that can be injected in ThreadWithException.
290
        else:
291
            self.ignored_exceptions = ignored
292
5247.2.2 by Vincent Ladeuil
Implement a thread that can re-raise exceptions.
293
    def run(self):
294
        """Overrides Thread.run to capture any exception."""
5247.2.5 by Vincent Ladeuil
Some cleanups.
295
        self.ready.clear()
5247.2.2 by Vincent Ladeuil
Implement a thread that can re-raise exceptions.
296
        try:
5247.3.19 by Vincent Ladeuil
Fix python-2.4 incompatibility.
297
            try:
298
                super(ThreadWithException, self).run()
299
            except:
300
                self.exception = sys.exc_info()
5247.2.4 by Vincent Ladeuil
Add an event to ThreadWithException that can be shared with the calling thread.
301
        finally:
302
            # Make sure the calling thread is released
5247.2.5 by Vincent Ladeuil
Some cleanups.
303
            self.ready.set()
5247.2.4 by Vincent Ladeuil
Add an event to ThreadWithException that can be shared with the calling thread.
304
5247.2.2 by Vincent Ladeuil
Implement a thread that can re-raise exceptions.
305
5247.3.13 by Vincent Ladeuil
Really test against a threading server and properly shutdown socket and threads.
306
    def join(self, timeout=5):
5247.2.3 by Vincent Ladeuil
join(timeout=0) is useful to check for an exception without stopping the thread.
307
        """Overrides Thread.join to raise any exception caught.
308
309
310
        Calling join(timeout=0) will raise the caught exception or return None
5247.3.10 by Vincent Ladeuil
Test errors during server life.
311
        if the thread is still alive.
5247.3.13 by Vincent Ladeuil
Really test against a threading server and properly shutdown socket and threads.
312
313
        The default timeout is set to 5 and should expire only when a thread
314
        serving a client connection is hung.
5247.2.3 by Vincent Ladeuil
join(timeout=0) is useful to check for an exception without stopping the thread.
315
        """
5247.3.13 by Vincent Ladeuil
Really test against a threading server and properly shutdown socket and threads.
316
        super(ThreadWithException, self).join(timeout)
5247.2.2 by Vincent Ladeuil
Implement a thread that can re-raise exceptions.
317
        if self.exception is not None:
5247.2.4 by Vincent Ladeuil
Add an event to ThreadWithException that can be shared with the calling thread.
318
            exc_class, exc_value, exc_tb = self.exception
5247.5.3 by Vincent Ladeuil
Fix exception raising only once for a given ThreadWithException.
319
            self.exception = None # The exception should be raised only once
5247.5.4 by Vincent Ladeuil
Implement an execption handling mechanism that can be injected in ThreadWithException.
320
            if (self.ignored_exceptions is None
5247.5.6 by Vincent Ladeuil
Just pass the exception object to simplify.
321
                or not self.ignored_exceptions(exc_value)):
5247.5.4 by Vincent Ladeuil
Implement an execption handling mechanism that can be injected in ThreadWithException.
322
                # Raise non ignored exceptions
323
                raise exc_class, exc_value, exc_tb
5247.3.13 by Vincent Ladeuil
Really test against a threading server and properly shutdown socket and threads.
324
        if timeout and self.isAlive():
325
            # The timeout expired without joining the thread, the thread is
326
            # therefore stucked and that's a failure as far as the test is
327
            # concerned. We used to hang here.
328
            raise AssertionError('thread %s hung' % (self.name,))
329
330
    def pending_exception(self):
331
        """Raise the caught exception.
332
333
        This does nothing if no exception occurred.
334
        """
335
        self.join(timeout=0)
5247.2.2 by Vincent Ladeuil
Implement a thread that can re-raise exceptions.
336
337
5247.3.8 by Vincent Ladeuil
Start implementing a TCP server running in its own thread (using
338
class TestingTCPServerMixin:
339
    """Mixin to support running SocketServer.TCPServer in a thread.
340
341
    Tests are connecting from the main thread, the server has to be run in a
342
    separate thread.
343
    """
344
5247.3.16 by Vincent Ladeuil
All http tests passing (including https).
345
    # FIXME: sibling_class is a hack -- vila 20100604
5247.3.11 by Vincent Ladeuil
Start implementing the threading variants.
346
    def __init__(self, sibling_class):
347
        self.sibling_class = sibling_class
5247.3.8 by Vincent Ladeuil
Start implementing a TCP server running in its own thread (using
348
        self.started = threading.Event()
349
        self.serving = threading.Event()
350
        self.stopped = threading.Event()
5247.3.12 by Vincent Ladeuil
Spawn a thread for each connection from a client.
351
        # We collect the resources used by the clients so we can release them
352
        # when shutting down
353
        self.clients = []
5247.5.4 by Vincent Ladeuil
Implement an execption handling mechanism that can be injected in ThreadWithException.
354
        self.ignored_exceptions = None
5247.3.8 by Vincent Ladeuil
Start implementing a TCP server running in its own thread (using
355
5247.3.11 by Vincent Ladeuil
Start implementing the threading variants.
356
    def server_bind(self):
357
        # We need to override the SocketServer bind, yet, we still want to use
358
        # it so we need to use the sibling class to call it explicitly
359
        self.sibling_class.server_bind(self)
360
        # The following has been fixed in 2.5 so we need to provide it for
361
        # older python versions.
362
        if sys.version < (2, 5):
363
            self.server_address = self.socket.getsockname()
364
5247.3.8 by Vincent Ladeuil
Start implementing a TCP server running in its own thread (using
365
    def serve(self):
366
        self.serving.set()
367
        self.stopped.clear()
368
        # We are listening and ready to accept connections
369
        self.started.set()
5247.5.9 by Vincent Ladeuil
Use a better sync for test_exception_swallowed_while_serving test.
370
        try:
371
            while self.serving.isSet():
372
                # Really a connection but the python framework is generic and
373
                # call them requests
374
                self.handle_request()
375
            # Let's close the listening socket
376
            self.server_close()
377
        finally:
378
            self.stopped.set()
5247.3.8 by Vincent Ladeuil
Start implementing a TCP server running in its own thread (using
379
5247.5.10 by Vincent Ladeuil
Fix broken test.
380
    def handle_request(self):
381
        """Handle one request.
382
383
        The python version swallows some socket exceptions and we don't use
384
        timeout, so we override it to better control the server behavior.
385
        """
386
        request, client_address = self.get_request()
387
        if self.verify_request(request, client_address):
388
            try:
389
                self.process_request(request, client_address)
390
            except:
391
                self.handle_error(request, client_address)
392
                self.close_request(request)
393
5247.3.9 by Vincent Ladeuil
Ensure a simple dialog can occur between a client and a server.
394
    def verify_request(self, request, client_address):
395
        """Verify the request.
396
397
        Return True if we should proceed with this request, False if we should
5247.3.12 by Vincent Ladeuil
Spawn a thread for each connection from a client.
398
        not even touch a single byte in the socket ! This is useful when we
399
        stop the server with a dummy last connection.
5247.3.9 by Vincent Ladeuil
Ensure a simple dialog can occur between a client and a server.
400
        """
401
        return self.serving.isSet()
402
5247.3.10 by Vincent Ladeuil
Test errors during server life.
403
    def handle_error(self, request, client_address):
404
        # Stop serving and re-raise the last exception seen
405
        self.serving.clear()
5247.3.18 by Vincent Ladeuil
Fix some fallouts from previous fixes, all tests passing (no more http leaks).
406
#        self.sibling_class.handle_error(self, request, client_address)
5247.3.10 by Vincent Ladeuil
Test errors during server life.
407
        raise
408
5247.5.7 by Vincent Ladeuil
Factor out socket exception handling during server shutdown.
409
    def ignored_exceptions_during_shutdown(self, e):
410
        if sys.platform == 'win32':
5247.5.8 by Vincent Ladeuil
Thanks for being inconsistently inconsistent.
411
            accepted_errnos = [errno.EBADF, errno.WSAEBADF, errno.WSAENOTCONN,
5247.5.9 by Vincent Ladeuil
Use a better sync for test_exception_swallowed_while_serving test.
412
                               errno.WSAECONNRESET, errno.WSAESHUTDOWN]
5247.5.7 by Vincent Ladeuil
Factor out socket exception handling during server shutdown.
413
        else:
414
            accepted_errnos = [errno.EBADF, errno.ENOTCONN, errno.ECONNRESET]
415
        if isinstance(e, socket.error) and e[0] in accepted_errnos:
416
            return True
417
        return False
418
5247.3.13 by Vincent Ladeuil
Really test against a threading server and properly shutdown socket and threads.
419
    # The following methods are called by the main thread
420
421
    def stop_client_connections(self):
422
        while self.clients:
423
            c = self.clients.pop()
424
            self.shutdown_client(c)
425
5247.5.9 by Vincent Ladeuil
Use a better sync for test_exception_swallowed_while_serving test.
426
    def shutdown_socket(self, sock):
427
        """Properly shutdown a socket.
5247.3.13 by Vincent Ladeuil
Really test against a threading server and properly shutdown socket and threads.
428
429
        This should be called only when no other thread is trying to use the
430
        socket.
431
        """
432
        try:
433
            sock.shutdown(socket.SHUT_RDWR)
434
            sock.close()
5247.5.7 by Vincent Ladeuil
Factor out socket exception handling during server shutdown.
435
        except Exception, e:
436
            if self.ignored_exceptions(e):
5247.3.13 by Vincent Ladeuil
Really test against a threading server and properly shutdown socket and threads.
437
                pass
438
            else:
439
                raise
5247.3.12 by Vincent Ladeuil
Spawn a thread for each connection from a client.
440
5247.5.4 by Vincent Ladeuil
Implement an execption handling mechanism that can be injected in ThreadWithException.
441
    # The following methods are called by the main thread
442
443
    def set_ignored_exceptions(self, thread, ignored_exceptions):
444
        self.ignored_exceptions = ignored_exceptions
445
        thread.set_ignored_exceptions(self.ignored_exceptions)
446
447
    def _pending_exception(self, thread):
448
        """Raise server uncaught exception.
449
450
        Daughter classes can override this if they use daughter threads.
451
        """
452
        thread.pending_exception()
453
5247.3.12 by Vincent Ladeuil
Spawn a thread for each connection from a client.
454
455
class TestingTCPServer(TestingTCPServerMixin, SocketServer.TCPServer):
456
457
    def __init__(self, server_address, request_handler_class):
458
        TestingTCPServerMixin.__init__(self, SocketServer.TCPServer)
459
        SocketServer.TCPServer.__init__(self, server_address,
460
                                        request_handler_class)
461
462
    def get_request(self):
463
        """Get the request and client address from the socket."""
464
        sock, addr = self.sibling_class.get_request(self)
465
        self.clients.append((sock, addr))
466
        return sock, addr
467
468
    # The following methods are called by the main thread
469
5247.3.13 by Vincent Ladeuil
Really test against a threading server and properly shutdown socket and threads.
470
    def shutdown_client(self, client):
471
        sock, addr = client
5247.5.9 by Vincent Ladeuil
Use a better sync for test_exception_swallowed_while_serving test.
472
        self.shutdown_socket(sock)
5247.3.13 by Vincent Ladeuil
Really test against a threading server and properly shutdown socket and threads.
473
5247.3.8 by Vincent Ladeuil
Start implementing a TCP server running in its own thread (using
474
5247.3.11 by Vincent Ladeuil
Start implementing the threading variants.
475
class TestingThreadingTCPServer(TestingTCPServerMixin,
476
                                SocketServer.ThreadingTCPServer):
477
478
    def __init__(self, server_address, request_handler_class):
479
        TestingTCPServerMixin.__init__(self, SocketServer.ThreadingTCPServer)
480
        SocketServer.TCPServer.__init__(self, server_address,
481
                                        request_handler_class)
482
5247.3.12 by Vincent Ladeuil
Spawn a thread for each connection from a client.
483
    def get_request (self):
484
        """Get the request and client address from the socket."""
485
        sock, addr = self.sibling_class.get_request(self)
486
        # The thread is not create yet, it will be updated in process_request
487
        self.clients.append((sock, addr, None))
488
        return sock, addr
489
5247.3.13 by Vincent Ladeuil
Really test against a threading server and properly shutdown socket and threads.
490
    def process_request_thread(self, started, stopped, request, client_address):
491
        started.set()
5247.3.12 by Vincent Ladeuil
Spawn a thread for each connection from a client.
492
        SocketServer.ThreadingTCPServer.process_request_thread(
493
            self, request, client_address)
494
        self.close_request(request)
495
        stopped.set()
496
497
    def process_request(self, request, client_address):
498
        """Start a new thread to process the request."""
5247.3.13 by Vincent Ladeuil
Really test against a threading server and properly shutdown socket and threads.
499
        started = threading.Event()
5247.3.12 by Vincent Ladeuil
Spawn a thread for each connection from a client.
500
        stopped = threading.Event()
5247.3.13 by Vincent Ladeuil
Really test against a threading server and properly shutdown socket and threads.
501
        t = ThreadWithException(
5247.3.12 by Vincent Ladeuil
Spawn a thread for each connection from a client.
502
            event=stopped,
5247.5.17 by Vincent Ladeuil
Add some basic debug tracing controlled by -Ethreads.
503
            name='%s -> %s' % (client_address, self.server_address),
5247.3.12 by Vincent Ladeuil
Spawn a thread for each connection from a client.
504
            target = self.process_request_thread,
5247.3.13 by Vincent Ladeuil
Really test against a threading server and properly shutdown socket and threads.
505
            args = (started, stopped, request, client_address))
5247.3.12 by Vincent Ladeuil
Spawn a thread for each connection from a client.
506
        # Update the client description
507
        self.clients.pop()
508
        self.clients.append((request, client_address, t))
5247.3.37 by Vincent Ladeuil
Use TestingTCPServerInAThread for smart test servers, only 4 test failures remaining.
509
        # Propagate the exception handler since we must use the same one for
5247.5.4 by Vincent Ladeuil
Implement an execption handling mechanism that can be injected in ThreadWithException.
510
        # connections running in their own threads than TestingTCPServer.
511
        t.set_ignored_exceptions(self.ignored_exceptions)
5247.3.12 by Vincent Ladeuil
Spawn a thread for each connection from a client.
512
        t.start()
5247.3.13 by Vincent Ladeuil
Really test against a threading server and properly shutdown socket and threads.
513
        started.wait()
5247.5.17 by Vincent Ladeuil
Add some basic debug tracing controlled by -Ethreads.
514
        if debug_threads():
515
            print 'Client thread %s started' % (t.name,)
5247.3.13 by Vincent Ladeuil
Really test against a threading server and properly shutdown socket and threads.
516
        # If an exception occured during the thread start, it will get raised.
517
        t.pending_exception()
518
519
    # The following methods are called by the main thread
520
521
    def shutdown_client(self, client):
5247.5.2 by Vincent Ladeuil
Cosmetic change.
522
        sock, addr, connection_thread = client
5247.5.9 by Vincent Ladeuil
Use a better sync for test_exception_swallowed_while_serving test.
523
        self.shutdown_socket(sock)
5247.5.2 by Vincent Ladeuil
Cosmetic change.
524
        if connection_thread is not None:
5247.3.13 by Vincent Ladeuil
Really test against a threading server and properly shutdown socket and threads.
525
            # The thread has been created only if the request is processed but
526
            # after the connection is inited. This could happen during server
527
            # shutdown. If an exception occurred in the thread it will be
528
            # re-raised
5247.5.17 by Vincent Ladeuil
Add some basic debug tracing controlled by -Ethreads.
529
            if debug_threads():
530
                print 'Client thread %s will be joined' % (
531
                    connection_thread.name,)
5247.5.2 by Vincent Ladeuil
Cosmetic change.
532
            connection_thread.join()
5247.3.12 by Vincent Ladeuil
Spawn a thread for each connection from a client.
533
5247.5.4 by Vincent Ladeuil
Implement an execption handling mechanism that can be injected in ThreadWithException.
534
    def set_ignored_exceptions(self, thread, ignored_exceptions):
535
        TestingTCPServerMixin.set_ignored_exceptions(self, thread,
536
                                                     ignored_exceptions)
537
        for sock, addr, connection_thread in self.clients:
538
            if connection_thread is not None:
539
                connection_thread.set_ignored_exceptions(
540
                    self.ignored_exceptions)
541
5247.5.3 by Vincent Ladeuil
Fix exception raising only once for a given ThreadWithException.
542
    def _pending_exception(self, thread):
543
        for sock, addr, connection_thread in self.clients:
544
            if connection_thread is not None:
545
                connection_thread.pending_exception()
5247.5.4 by Vincent Ladeuil
Implement an execption handling mechanism that can be injected in ThreadWithException.
546
        TestingTCPServerMixin._pending_exception(self, thread)
5247.5.3 by Vincent Ladeuil
Fix exception raising only once for a given ThreadWithException.
547
5247.3.11 by Vincent Ladeuil
Start implementing the threading variants.
548
5247.3.14 by Vincent Ladeuil
Use a proper load_tests.
549
class TestingTCPServerInAThread(transport.Server):
5247.3.11 by Vincent Ladeuil
Start implementing the threading variants.
550
    """A server in a thread that re-raise thread exceptions."""
5247.3.8 by Vincent Ladeuil
Start implementing a TCP server running in its own thread (using
551
552
    def __init__(self, server_address, server_class, request_handler_class):
553
        self.server_class = server_class
554
        self.request_handler_class = request_handler_class
5247.3.15 by Vincent Ladeuil
All http tests passing, https failing.
555
        self.host, self.port = server_address
5247.3.10 by Vincent Ladeuil
Test errors during server life.
556
        self.server = None
5247.5.4 by Vincent Ladeuil
Implement an execption handling mechanism that can be injected in ThreadWithException.
557
        self._server_thread = None
5247.3.8 by Vincent Ladeuil
Start implementing a TCP server running in its own thread (using
558
5247.3.14 by Vincent Ladeuil
Use a proper load_tests.
559
    def __repr__(self):
5247.3.15 by Vincent Ladeuil
All http tests passing, https failing.
560
        return "%s(%s:%s)" % (self.__class__.__name__, self.host, self.port)
5247.3.14 by Vincent Ladeuil
Use a proper load_tests.
561
5247.3.8 by Vincent Ladeuil
Start implementing a TCP server running in its own thread (using
562
    def create_server(self):
5247.3.15 by Vincent Ladeuil
All http tests passing, https failing.
563
        return self.server_class((self.host, self.port),
5247.3.8 by Vincent Ladeuil
Start implementing a TCP server running in its own thread (using
564
                                 self.request_handler_class)
565
566
    def start_server(self):
567
        self.server = self.create_server()
568
        self._server_thread = ThreadWithException(
5247.5.17 by Vincent Ladeuil
Add some basic debug tracing controlled by -Ethreads.
569
            event=self.server.started,
570
            target=self.run_server)
5247.3.8 by Vincent Ladeuil
Start implementing a TCP server running in its own thread (using
571
        self._server_thread.start()
572
        # Wait for the server thread to start (i.e release the lock)
573
        self.server.started.wait()
574
        # Get the real address, especially the port
5247.3.15 by Vincent Ladeuil
All http tests passing, https failing.
575
        self.host, self.port = self.server.server_address
5247.5.18 by Vincent Ladeuil
Compatibility with python 2.5 and 2.4 for ThreadWithException.name.
576
        self._server_thread.name = self.server.server_address
577
        if debug_threads():
578
            print 'Server thread %s started' % (self._server_thread.name,)
5247.3.13 by Vincent Ladeuil
Really test against a threading server and properly shutdown socket and threads.
579
        # If an exception occured during the server start, it will get raised,
580
        # otherwise, the server is blocked on its accept() call.
581
        self._server_thread.pending_exception()
5247.3.10 by Vincent Ladeuil
Test errors during server life.
582
        # From now on, we'll use a different event to ensure the server can set
583
        # its exception
584
        self._server_thread.set_event(self.server.stopped)
5247.3.8 by Vincent Ladeuil
Start implementing a TCP server running in its own thread (using
585
586
    def run_server(self):
587
        self.server.serve()
588
589
    def stop_server(self):
590
        if self.server is None:
591
            return
5247.3.13 by Vincent Ladeuil
Really test against a threading server and properly shutdown socket and threads.
592
        try:
593
            # The server has been started successfully, shut it down now.  As
5247.5.10 by Vincent Ladeuil
Fix broken test.
594
            # soon as we stop serving, no more connection are accepted except
595
            # one to get out of the blocking listen.
5247.5.7 by Vincent Ladeuil
Factor out socket exception handling during server shutdown.
596
            self.set_ignored_exceptions(
597
                self.server.ignored_exceptions_during_shutdown)
5247.5.10 by Vincent Ladeuil
Fix broken test.
598
            self.server.serving.clear()
5247.5.17 by Vincent Ladeuil
Add some basic debug tracing controlled by -Ethreads.
599
            if debug_threads():
600
                print 'Server thread %s will be joined' % (
601
                    self._server_thread.name,)
5247.3.13 by Vincent Ladeuil
Really test against a threading server and properly shutdown socket and threads.
602
            # The server is listening for a last connection, let's give it:
603
            last_conn = None
604
            try:
5247.3.15 by Vincent Ladeuil
All http tests passing, https failing.
605
                last_conn = osutils.connect_socket((self.host, self.port))
5247.3.13 by Vincent Ladeuil
Really test against a threading server and properly shutdown socket and threads.
606
            except socket.error, e:
607
                # But ignore connection errors as the point is to unblock the
608
                # server thread, it may happen that it's not blocked or even
609
                # not started.
610
                pass
611
            # We start shutting down the client while the server itself is
612
            # shutting down.
613
            self.server.stop_client_connections()
614
            # Now we wait for the thread running self.server.serve() to finish
615
            self.server.stopped.wait()
616
            if last_conn is not None:
617
                # Close the last connection without trying to use it. The
618
                # server will not process a single byte on that socket to avoid
619
                # complications (SSL starts with a handshake for example).
620
                last_conn.close()
5247.3.10 by Vincent Ladeuil
Test errors during server life.
621
            # Check for any exception that could have occurred in the server
622
            # thread
5247.5.9 by Vincent Ladeuil
Use a better sync for test_exception_swallowed_while_serving test.
623
            try:
624
                self._server_thread.join()
625
            except Exception, e:
626
                if self.server.ignored_exceptions(e):
627
                    pass
628
                else:
629
                    raise
5247.3.10 by Vincent Ladeuil
Test errors during server life.
630
        finally:
5247.3.13 by Vincent Ladeuil
Really test against a threading server and properly shutdown socket and threads.
631
            # Make sure we can be called twice safely, note that this means
632
            # that we will raise a single exception even if several occurred in
633
            # the various threads involved.
5247.3.10 by Vincent Ladeuil
Test errors during server life.
634
            self.server = None
5247.3.8 by Vincent Ladeuil
Start implementing a TCP server running in its own thread (using
635
5247.5.4 by Vincent Ladeuil
Implement an execption handling mechanism that can be injected in ThreadWithException.
636
    def set_ignored_exceptions(self, ignored_exceptions):
637
        """Install an exception handler for the server."""
638
        self.server.set_ignored_exceptions(self._server_thread,
639
                                           ignored_exceptions)
640
5247.5.3 by Vincent Ladeuil
Fix exception raising only once for a given ThreadWithException.
641
    def pending_exception(self):
642
        """Raise uncaught exception in the server."""
643
        self.server._pending_exception(self._server_thread)
644
5247.3.12 by Vincent Ladeuil
Spawn a thread for each connection from a client.
645
5247.3.38 by Vincent Ladeuil
Fix the last remaining failures.
646
class TestingSmartConnectionHandler(SocketServer.BaseRequestHandler,
647
                                    medium.SmartServerSocketStreamMedium):
5247.3.37 by Vincent Ladeuil
Use TestingTCPServerInAThread for smart test servers, only 4 test failures remaining.
648
649
    def __init__(self, request, client_address, server):
650
        medium.SmartServerSocketStreamMedium.__init__(
651
            self, request, server.backing_transport,
652
            server.root_client_path)
653
        request.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
654
        SocketServer.BaseRequestHandler.__init__(self, request, client_address,
655
                                                 server)
656
657
    def handle(self):
658
        while not self.finished:
659
            server_protocol = self._build_protocol()
660
            self._serve_one_request(server_protocol)
661
662
663
class TestingSmartServer(TestingThreadingTCPServer, server.SmartTCPServer):
664
665
    def __init__(self, server_address, request_handler_class,
666
                 backing_transport, root_client_path):
667
        TestingThreadingTCPServer.__init__(self, server_address,
668
                                           request_handler_class)
669
        server.SmartTCPServer.__init__(self, backing_transport,
670
                                       root_client_path)
5247.3.38 by Vincent Ladeuil
Fix the last remaining failures.
671
    def serve(self):
672
        # FIXME: No test are exercising the hooks for the test server
673
        # -- vila 20100618
674
        self.run_server_started_hooks()
675
        try:
676
            TestingThreadingTCPServer.serve(self)
677
        finally:
678
            self.run_server_stopped_hooks()
5247.3.37 by Vincent Ladeuil
Use TestingTCPServerInAThread for smart test servers, only 4 test failures remaining.
679
680
    def get_url(self):
681
        """Return the url of the server"""
682
        return "bzr://%s:%d/" % self.server_address
683
684
685
class SmartTCPServer_for_testing(TestingTCPServerInAThread):
5017.3.18 by Vincent Ladeuil
Move SmartTCPServer_for_testing and friends to bzrlib.tests.test_server
686
    """Server suitable for use by transport tests.
687
688
    This server is backed by the process's cwd.
689
    """
690
    def __init__(self, thread_name_suffix=''):
691
        self.client_path_extra = None
692
        self.thread_name_suffix = thread_name_suffix
5247.3.37 by Vincent Ladeuil
Use TestingTCPServerInAThread for smart test servers, only 4 test failures remaining.
693
        self.host = '127.0.0.1'
694
        self.port = 0
695
        super(SmartTCPServer_for_testing, self).__init__(
696
                (self.host, self.port),
697
                TestingSmartServer,
5247.3.38 by Vincent Ladeuil
Fix the last remaining failures.
698
                TestingSmartConnectionHandler)
5247.3.37 by Vincent Ladeuil
Use TestingTCPServerInAThread for smart test servers, only 4 test failures remaining.
699
700
    def create_server(self):
701
        return self.server_class((self.host, self.port),
702
                                 self.request_handler_class,
703
                                 self.backing_transport,
704
                                 self.root_client_path)
705
5017.3.18 by Vincent Ladeuil
Move SmartTCPServer_for_testing and friends to bzrlib.tests.test_server
706
707
    def start_server(self, backing_transport_server=None,
5247.3.37 by Vincent Ladeuil
Use TestingTCPServerInAThread for smart test servers, only 4 test failures remaining.
708
                     client_path_extra='/extra/'):
5017.3.18 by Vincent Ladeuil
Move SmartTCPServer_for_testing and friends to bzrlib.tests.test_server
709
        """Set up server for testing.
710
711
        :param backing_transport_server: backing server to use.  If not
712
            specified, a LocalURLServer at the current working directory will
713
            be used.
714
        :param client_path_extra: a path segment starting with '/' to append to
715
            the root URL for this server.  For instance, a value of '/foo/bar/'
716
            will mean the root of the backing transport will be published at a
717
            URL like `bzr://127.0.0.1:nnnn/foo/bar/`, rather than
718
            `bzr://127.0.0.1:nnnn/`.  Default value is `extra`, so that tests
719
            by default will fail unless they do the necessary path translation.
720
        """
721
        if not client_path_extra.startswith('/'):
722
            raise ValueError(client_path_extra)
5247.3.37 by Vincent Ladeuil
Use TestingTCPServerInAThread for smart test servers, only 4 test failures remaining.
723
        self.root_client_path = self.client_path_extra = client_path_extra
5017.3.18 by Vincent Ladeuil
Move SmartTCPServer_for_testing and friends to bzrlib.tests.test_server
724
        from bzrlib.transport.chroot import ChrootServer
725
        if backing_transport_server is None:
726
            backing_transport_server = LocalURLServer()
727
        self.chroot_server = ChrootServer(
728
            self.get_backing_transport(backing_transport_server))
729
        self.chroot_server.start_server()
730
        self.backing_transport = transport.get_transport(
731
            self.chroot_server.get_url())
5247.3.37 by Vincent Ladeuil
Use TestingTCPServerInAThread for smart test servers, only 4 test failures remaining.
732
        super(SmartTCPServer_for_testing, self).start_server()
733
5247.3.38 by Vincent Ladeuil
Fix the last remaining failures.
734
    def stop_server(self):
5247.3.40 by Vincent Ladeuil
Make sure the chroot server is shut down too.
735
        try:
736
            super(SmartTCPServer_for_testing, self).stop_server()
737
        finally:
738
            self.chroot_server.stop_server()
5247.3.38 by Vincent Ladeuil
Fix the last remaining failures.
739
5247.3.37 by Vincent Ladeuil
Use TestingTCPServerInAThread for smart test servers, only 4 test failures remaining.
740
    def get_backing_transport(self, backing_transport_server):
741
        """Get a backing transport from a server we are decorating."""
742
        return transport.get_transport(backing_transport_server.get_url())
5017.3.18 by Vincent Ladeuil
Move SmartTCPServer_for_testing and friends to bzrlib.tests.test_server
743
744
    def get_url(self):
5247.3.37 by Vincent Ladeuil
Use TestingTCPServerInAThread for smart test servers, only 4 test failures remaining.
745
        url = self.server.get_url()
5017.3.18 by Vincent Ladeuil
Move SmartTCPServer_for_testing and friends to bzrlib.tests.test_server
746
        return url[:-1] + self.client_path_extra
747
748
    def get_bogus_url(self):
749
        """Return a URL which will fail to connect"""
750
        return 'bzr://127.0.0.1:1/'
751
752
753
class ReadonlySmartTCPServer_for_testing(SmartTCPServer_for_testing):
754
    """Get a readonly server for testing."""
755
756
    def get_backing_transport(self, backing_transport_server):
757
        """Get a backing transport from a server we are decorating."""
758
        url = 'readonly+' + backing_transport_server.get_url()
759
        return transport.get_transport(url)
760
761
762
class SmartTCPServer_for_testing_v2_only(SmartTCPServer_for_testing):
763
    """A variation of SmartTCPServer_for_testing that limits the client to
764
    using RPCs in protocol v2 (i.e. bzr <= 1.5).
765
    """
766
767
    def get_url(self):
768
        url = super(SmartTCPServer_for_testing_v2_only, self).get_url()
769
        url = 'bzr-v2://' + url[len('bzr://'):]
770
        return url
771
772
773
class ReadonlySmartTCPServer_for_testing_v2_only(
774
    SmartTCPServer_for_testing_v2_only):
775
    """Get a readonly server for testing."""
776
777
    def get_backing_transport(self, backing_transport_server):
778
        """Get a backing transport from a server we are decorating."""
779
        url = 'readonly+' + backing_transport_server.get_url()
780
        return transport.get_transport(url)
781
782
783
784