← 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-10 14:26:04 UTC
  • mfrom: (6205.1.1 2.4-into-2.5)
  • Revision ID: pqm@pqm.ubuntu.com-20111010142604-n77hphh9k3lfn668
(jam) Merge bzr-2.4 into bzr.dev, resolving small conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_server.py
289
289
 
290
290
    def serve(self):
291
291
        self.serving = True
292
 
        self.stopped.clear()
293
292
        # We are listening and ready to accept connections
294
293
        self.started.set()
295
294
        try:
464
463
        if debug_threads():
465
464
            sys.stderr.write('Client thread %s started\n' % (t.name,))
466
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)
467
468
        t.pending_exception()
468
469
 
469
470
    # The following methods are called by the main thread
519
520
            sync_event=self.server.started,
520
521
            target=self.run_server)
521
522
        self._server_thread.start()
522
 
        # 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)
523
524
        self.server.started.wait()
524
525
        # Get the real address, especially the port
525
526
        self.host, self.port = self.server.server_address