/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_server.py

  • Committer: Vincent Ladeuil
  • Date: 2011-11-24 15:48:29 UTC
  • mfrom: (6289 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6337.
  • Revision ID: v.ladeuil+lp@free.fr-20111124154829-avowjpsxdl8yp2vz
merge trunk resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_server.py
19
19
import SocketServer
20
20
import sys
21
21
import threading
 
22
import traceback
22
23
 
23
24
 
24
25
from bzrlib import (
25
26
    cethread,
 
27
    errors,
26
28
    osutils,
27
29
    transport,
28
30
    urlutils,
212
214
    def start_server(self, backing_server=None):
213
215
        """Setup the Chroot on backing_server."""
214
216
        if backing_server is not None:
215
 
            self.backing_transport = transport.get_transport(
 
217
            self.backing_transport = transport.get_transport_from_url(
216
218
                backing_server.get_url())
217
219
        else:
218
 
            self.backing_transport = transport.get_transport('.')
 
220
            self.backing_transport = transport.get_transport_from_path('.')
219
221
        self.backing_transport.clone('added-by-filter').ensure_base()
220
222
        self.filter_func = lambda x: 'added-by-filter/' + x
221
223
        super(TestingPathFilteringServer, self).start_server()
233
235
    def start_server(self, backing_server=None):
234
236
        """Setup the Chroot on backing_server."""
235
237
        if backing_server is not None:
236
 
            self.backing_transport = transport.get_transport(
 
238
            self.backing_transport = transport.get_transport_from_url(
237
239
                backing_server.get_url())
238
240
        else:
239
 
            self.backing_transport = transport.get_transport('.')
 
241
            self.backing_transport = transport.get_transport_from_path('.')
240
242
        super(TestingChrootServer, self).start_server()
241
243
 
242
244
    def get_bogus_url(self):
265
267
            #raise AssertionError('thread %s hung' % (self.name,))
266
268
 
267
269
 
268
 
class TestingTCPServerMixin:
 
270
class TestingTCPServerMixin(object):
269
271
    """Mixin to support running SocketServer.TCPServer in a thread.
270
272
 
271
273
    Tests are connecting from the main thread, the server has to be run in a
311
313
                self.process_request(request, client_address)
312
314
            except:
313
315
                self.handle_error(request, client_address)
314
 
                self.close_request(request)
 
316
        else:
 
317
            self.close_request(request)
315
318
 
316
319
    def get_request(self):
317
320
        return self.socket.accept()
331
334
        # The following can be used for debugging purposes, it will display the
332
335
        # exception and the traceback just when it occurs instead of waiting
333
336
        # for the thread to be joined.
334
 
 
335
337
        # SocketServer.BaseServer.handle_error(self, request, client_address)
 
338
 
 
339
        # We call close_request manually, because we are going to raise an
 
340
        # exception. The SocketServer implementation calls:
 
341
        #   handle_error(...)
 
342
        #   close_request(...)
 
343
        # But because we raise the exception, close_request will never be
 
344
        # triggered. This helps client not block waiting for a response when
 
345
        # the server gets an exception.
 
346
        self.close_request(request)
336
347
        raise
337
348
 
338
349
    def ignored_exceptions_during_shutdown(self, e):
418
429
        SocketServer.ThreadingTCPServer.__init__(self, server_address,
419
430
                                                 request_handler_class)
420
431
 
421
 
    def get_request (self):
 
432
    def get_request(self):
422
433
        """Get the request and client address from the socket."""
423
434
        sock, addr = TestingTCPServerMixin.get_request(self)
424
435
        # The thread is not created yet, it will be updated in process_request
594
605
    def __init__(self, request, client_address, server):
595
606
        medium.SmartServerSocketStreamMedium.__init__(
596
607
            self, request, server.backing_transport,
597
 
            server.root_client_path)
 
608
            server.root_client_path,
 
609
            timeout=_DEFAULT_TESTING_CLIENT_TIMEOUT)
598
610
        request.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
599
611
        SocketServer.BaseRequestHandler.__init__(self, request, client_address,
600
612
                                                 server)
601
613
 
602
614
    def handle(self):
603
 
        while not self.finished:
604
 
            server_protocol = self._build_protocol()
605
 
            self._serve_one_request(server_protocol)
606
 
 
 
615
        try:
 
616
            while not self.finished:
 
617
                server_protocol = self._build_protocol()
 
618
                self._serve_one_request(server_protocol)
 
619
        except errors.ConnectionTimeout:
 
620
            # idle connections aren't considered a failure of the server
 
621
            return
 
622
 
 
623
 
 
624
_DEFAULT_TESTING_CLIENT_TIMEOUT = 60.0
607
625
 
608
626
class TestingSmartServer(TestingThreadingTCPServer, server.SmartTCPServer):
609
627
 
612
630
        TestingThreadingTCPServer.__init__(self, server_address,
613
631
                                           request_handler_class)
614
632
        server.SmartTCPServer.__init__(self, backing_transport,
615
 
                                       root_client_path)
 
633
            root_client_path, client_timeout=_DEFAULT_TESTING_CLIENT_TIMEOUT)
 
634
 
616
635
    def serve(self):
617
636
        self.run_server_started_hooks()
618
637
        try:
670
689
        self.chroot_server = ChrootServer(
671
690
            self.get_backing_transport(backing_transport_server))
672
691
        self.chroot_server.start_server()
673
 
        self.backing_transport = transport.get_transport(
 
692
        self.backing_transport = transport.get_transport_from_url(
674
693
            self.chroot_server.get_url())
675
694
        super(SmartTCPServer_for_testing, self).start_server()
676
695
 
682
701
 
683
702
    def get_backing_transport(self, backing_transport_server):
684
703
        """Get a backing transport from a server we are decorating."""
685
 
        return transport.get_transport(backing_transport_server.get_url())
 
704
        return transport.get_transport_from_url(
 
705
            backing_transport_server.get_url())
686
706
 
687
707
    def get_url(self):
688
708
        url = self.server.get_url()
699
719
    def get_backing_transport(self, backing_transport_server):
700
720
        """Get a backing transport from a server we are decorating."""
701
721
        url = 'readonly+' + backing_transport_server.get_url()
702
 
        return transport.get_transport(url)
 
722
        return transport.get_transport_from_url(url)
703
723
 
704
724
 
705
725
class SmartTCPServer_for_testing_v2_only(SmartTCPServer_for_testing):
720
740
    def get_backing_transport(self, backing_transport_server):
721
741
        """Get a backing transport from a server we are decorating."""
722
742
        url = 'readonly+' + backing_transport_server.get_url()
723
 
        return transport.get_transport(url)
 
743
        return transport.get_transport_from_url(url)