← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/http_server.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-11-17 03:20:35 UTC
  • mfrom: (4792.4.3 456036)
  • Revision ID: pqm@pqm.ubuntu.com-20091117032035-s3sgtlixj1lrminn
(Gordon Tyler) Fix IndexError during 'bzr ignore /' (#456036)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/http_server.py
318
318
        self.test_case_server = test_case_server
319
319
        self._home_dir = test_case_server._home_dir
320
320
 
321
 
    def stop_server(self):
 
321
    def tearDown(self):
322
322
         """Called to clean-up the server.
323
323
 
324
324
         Since the server may be (surely is, even) in a blocking listen, we
347
347
             # 'Socket is not connected' can also occur on OSX, with a
348
348
             # "regular" ENOTCONN (when something went wrong during test case
349
349
             # setup leading to self.setUp() *not* being called but
350
 
             # self.stop_server() still being called -- vila20081106
 
350
             # self.tearDown() still being called -- vila20081106
351
351
             if not len(e.args) or e.args[0] not in (errno.ENOTCONN, 10057):
352
352
                 raise
353
353
         # Let the server properly close the socket
494
494
            except socket.timeout:
495
495
                pass
496
496
            except (socket.error, select.error), e:
497
 
                if (e[0] == errno.EBADF
498
 
                    or (sys.platform == 'win32' and e[0] == 10038)):
499
 
                    # Starting with python-2.6, handle_request may raise socket
500
 
                    # or select exceptions when the server is shut down (as we
501
 
                    # do).
502
 
                    # 10038 = WSAENOTSOCK
503
 
                    # http://msdn.microsoft.com/en-us/library/ms740668%28VS.85%29.aspx
504
 
                    pass
505
 
                else:
506
 
                    raise
 
497
               if e[0] == errno.EBADF:
 
498
                   # Starting with python-2.6, handle_request may raise socket
 
499
                   # or select exceptions when the server is shut down (as we
 
500
                   # do).
 
501
                   pass
 
502
               else:
 
503
                   raise
507
504
 
508
505
    def _get_remote_url(self, path):
509
506
        path_parts = path.split(os.path.sep)
521
518
        """Capture Server log output."""
522
519
        self.logs.append(format % args)
523
520
 
524
 
    def start_server(self, backing_transport_server=None):
525
 
        """See bzrlib.transport.Server.start_server.
 
521
    def setUp(self, backing_transport_server=None):
 
522
        """See bzrlib.transport.Server.setUp.
526
523
 
527
524
        :param backing_transport_server: The transport that requests over this
528
525
            protocol should be forwarded to. Note that this is currently not
557
554
        self._http_starting.release()
558
555
        self.logs = []
559
556
 
560
 
    def stop_server(self):
561
 
        self._httpd.stop_server()
 
557
    def tearDown(self):
 
558
        """See bzrlib.transport.Server.tearDown."""
 
559
        self._httpd.tearDown()
562
560
        self._http_running = False
563
561
        # We don't need to 'self._http_thread.join()' here since the thread is
564
562
        # a daemonic one and will be garbage collected anyway. Joining just