/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/http_server.py

  • Committer: Jelmer Vernooij
  • Date: 2010-03-21 21:39:33 UTC
  • mfrom: (5102 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5143.
  • Revision ID: jelmer@samba.org-20100321213933-fexeh9zcoz8oaju2
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/http_server.py
1
 
# Copyright (C) 2006, 2007 Canonical Ltd
 
1
# Copyright (C) 2006-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
31
31
import urlparse
32
32
 
33
33
from bzrlib import transport
 
34
from bzrlib.tests import test_server
34
35
from bzrlib.transport import local
35
36
 
36
37
 
318
319
        self.test_case_server = test_case_server
319
320
        self._home_dir = test_case_server._home_dir
320
321
 
321
 
    def tearDown(self):
 
322
    def stop_server(self):
322
323
         """Called to clean-up the server.
323
324
 
324
325
         Since the server may be (surely is, even) in a blocking listen, we
347
348
             # 'Socket is not connected' can also occur on OSX, with a
348
349
             # "regular" ENOTCONN (when something went wrong during test case
349
350
             # setup leading to self.setUp() *not* being called but
350
 
             # self.tearDown() still being called -- vila20081106
 
351
             # self.stop_server() still being called -- vila20081106
351
352
             if not len(e.args) or e.args[0] not in (errno.ENOTCONN, 10057):
352
353
                 raise
353
354
         # Let the server properly close the socket
521
522
        """Capture Server log output."""
522
523
        self.logs.append(format % args)
523
524
 
524
 
    def setUp(self, backing_transport_server=None):
525
 
        """See bzrlib.transport.Server.setUp.
 
525
    def start_server(self, backing_transport_server=None):
 
526
        """See bzrlib.transport.Server.start_server.
526
527
 
527
528
        :param backing_transport_server: The transport that requests over this
528
529
            protocol should be forwarded to. Note that this is currently not
530
531
        """
531
532
        # XXX: TODO: make the server back onto vfs_server rather than local
532
533
        # disk.
533
 
        if not (backing_transport_server is None or \
534
 
                isinstance(backing_transport_server, local.LocalURLServer)):
 
534
        if not (backing_transport_server is None
 
535
                or isinstance(backing_transport_server,
 
536
                              test_server.LocalURLServer)):
535
537
            raise AssertionError(
536
538
                "HTTPServer currently assumes local transport, got %s" % \
537
539
                backing_transport_server)
557
559
        self._http_starting.release()
558
560
        self.logs = []
559
561
 
560
 
    def tearDown(self):
561
 
        """See bzrlib.transport.Server.tearDown."""
562
 
        self._httpd.tearDown()
 
562
    def stop_server(self):
 
563
        self._httpd.stop_server()
563
564
        self._http_running = False
564
565
        # We don't need to 'self._http_thread.join()' here since the thread is
565
566
        # a daemonic one and will be garbage collected anyway. Joining just