/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: John Arbash Meinel
  • Date: 2011-01-10 22:20:12 UTC
  • mfrom: (5582 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5599.
  • Revision ID: john@arbash-meinel.com-20110110222012-mtcqudkvmzwiufuc
Merge in the bzr.dev 5582

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_server.py
1
 
# Copyright (C) 2010 Canonical Ltd
 
1
# Copyright (C) 2010, 2011 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
531
531
        # Update the client description
532
532
        self.clients.pop()
533
533
        self.clients.append((request, client_address, t))
534
 
        # Propagate the exception handler since we must use the same one for
535
 
        # connections running in their own threads than TestingTCPServer.
 
534
        # Propagate the exception handler since we must use the same one as
 
535
        # TestingTCPServer for connections running in their own threads.
536
536
        t.set_ignored_exceptions(self.ignored_exceptions)
537
537
        t.start()
538
538
        started.wait()
634
634
                # server thread, it may happen that it's not blocked or even
635
635
                # not started.
636
636
                pass
637
 
            # We start shutting down the client while the server itself is
 
637
            # We start shutting down the clients while the server itself is
638
638
            # shutting down.
639
639
            self.server.stop_client_connections()
640
640
            # Now we wait for the thread running self.server.serve() to finish