← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_server.py

  • Committer: Patch Queue Manager
  • Date: 2011-10-14 16:54:26 UTC
  • mfrom: (6216.1.1 remove-this-file)
  • Revision ID: pqm@pqm.ubuntu.com-20111014165426-tjix4e6idryf1r2z
(jelmer) Remove an accidentally committed .THIS file. (Jelmer Vernooij)

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
287
289
 
288
290
    def serve(self):
289
291
        self.serving = True
290
 
        self.stopped.clear()
291
292
        # We are listening and ready to accept connections
292
293
        self.started.set()
293
294
        try:
312
313
                self.process_request(request, client_address)
313
314
            except:
314
315
                self.handle_error(request, client_address)
315
 
                self.close_request(request)
 
316
        else:
 
317
            self.close_request(request)
316
318
 
317
319
    def get_request(self):
318
320
        return self.socket.accept()
332
334
        # The following can be used for debugging purposes, it will display the
333
335
        # exception and the traceback just when it occurs instead of waiting
334
336
        # for the thread to be joined.
335
 
 
336
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)
337
347
        raise
338
348
 
339
349
    def ignored_exceptions_during_shutdown(self, e):
419
429
        SocketServer.ThreadingTCPServer.__init__(self, server_address,
420
430
                                                 request_handler_class)
421
431
 
422
 
    def get_request (self):
 
432
    def get_request(self):
423
433
        """Get the request and client address from the socket."""
424
434
        sock, addr = TestingTCPServerMixin.get_request(self)
425
435
        # The thread is not create yet, it will be updated in process_request
440
450
        t = TestThread(
441
451
            sync_event=stopped,
442
452
            name='%s -> %s' % (client_address, self.server_address),
443
 
            target = self.process_request_thread,
444
 
            args = (started, stopped, request, client_address))
 
453
            target=self.process_request_thread,
 
454
            args=(started, stopped, request, client_address))
445
455
        # Update the client description
446
456
        self.clients.pop()
447
457
        self.clients.append((request, client_address, t))
453
463
        if debug_threads():
454
464
            sys.stderr.write('Client thread %s started\n' % (t.name,))
455
465
        # If an exception occured during the thread start, it will get raised.
 
466
        # In rare cases, an exception raised during the request processing may
 
467
        # also get caught here (see http://pad.lv/869366)
456
468
        t.pending_exception()
457
469
 
458
470
    # The following methods are called by the main thread
508
520
            sync_event=self.server.started,
509
521
            target=self.run_server)
510
522
        self._server_thread.start()
511
 
        # Wait for the server thread to start (i.e release the lock)
 
523
        # Wait for the server thread to start (i.e. release the lock)
512
524
        self.server.started.wait()
513
525
        # Get the real address, especially the port
514
526
        self.host, self.port = self.server.server_address
589
601
    def __init__(self, request, client_address, server):
590
602
        medium.SmartServerSocketStreamMedium.__init__(
591
603
            self, request, server.backing_transport,
592
 
            server.root_client_path)
 
604
            server.root_client_path,
 
605
            timeout=_DEFAULT_TESTING_CLIENT_TIMEOUT)
593
606
        request.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
594
607
        SocketServer.BaseRequestHandler.__init__(self, request, client_address,
595
608
                                                 server)
596
609
 
597
610
    def handle(self):
598
 
        while not self.finished:
599
 
            server_protocol = self._build_protocol()
600
 
            self._serve_one_request(server_protocol)
601
 
 
 
611
        try:
 
612
            while not self.finished:
 
613
                server_protocol = self._build_protocol()
 
614
                self._serve_one_request(server_protocol)
 
615
        except errors.ConnectionTimeout:
 
616
            # idle connections aren't considered a failure of the server
 
617
            return
 
618
 
 
619
 
 
620
_DEFAULT_TESTING_CLIENT_TIMEOUT = 60.0
602
621
 
603
622
class TestingSmartServer(TestingThreadingTCPServer, server.SmartTCPServer):
604
623
 
607
626
        TestingThreadingTCPServer.__init__(self, server_address,
608
627
                                           request_handler_class)
609
628
        server.SmartTCPServer.__init__(self, backing_transport,
610
 
                                       root_client_path)
 
629
            root_client_path, client_timeout=_DEFAULT_TESTING_CLIENT_TIMEOUT)
 
630
 
611
631
    def serve(self):
612
632
        self.run_server_started_hooks()
613
633
        try:
665
685
        self.chroot_server = ChrootServer(
666
686
            self.get_backing_transport(backing_transport_server))
667
687
        self.chroot_server.start_server()
668
 
        self.backing_transport = transport.get_transport(
 
688
        self.backing_transport = transport.get_transport_from_url(
669
689
            self.chroot_server.get_url())
670
690
        super(SmartTCPServer_for_testing, self).start_server()
671
691
 
677
697
 
678
698
    def get_backing_transport(self, backing_transport_server):
679
699
        """Get a backing transport from a server we are decorating."""
680
 
        return transport.get_transport(backing_transport_server.get_url())
 
700
        return transport.get_transport_from_url(
 
701
            backing_transport_server.get_url())
681
702
 
682
703
    def get_url(self):
683
704
        url = self.server.get_url()
694
715
    def get_backing_transport(self, backing_transport_server):
695
716
        """Get a backing transport from a server we are decorating."""
696
717
        url = 'readonly+' + backing_transport_server.get_url()
697
 
        return transport.get_transport(url)
 
718
        return transport.get_transport_from_url(url)
698
719
 
699
720
 
700
721
class SmartTCPServer_for_testing_v2_only(SmartTCPServer_for_testing):
715
736
    def get_backing_transport(self, backing_transport_server):
716
737
        """Get a backing transport from a server we are decorating."""
717
738
        url = 'readonly+' + backing_transport_server.get_url()
718
 
        return transport.get_transport(url)
 
739
        return transport.get_transport_from_url(url)