← 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: Vincent Ladeuil
  • Date: 2011-02-08 16:26:23 UTC
  • mto: This revision was merged to the branch mainline in revision 5655.
  • Revision ID: v.ladeuil+lp@free.fr-20110208162623-2njflo8y7rrtek3n
Use clearer names.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_server.py
243
243
        raise NotImplementedError
244
244
 
245
245
 
246
 
class TestThread(thread.ThreadWithException):
 
246
class TestThread(thread.CatchingExceptionThread):
247
247
 
248
248
    def join(self, timeout=5):
249
249
        """Overrides to use a default timeout.
438
438
        started = threading.Event()
439
439
        stopped = threading.Event()
440
440
        t = TestThread(
441
 
            event=stopped,
 
441
            sync_event=stopped,
442
442
            name='%s -> %s' % (client_address, self.server_address),
443
443
            target = self.process_request_thread,
444
444
            args = (started, stopped, request, client_address))
505
505
    def start_server(self):
506
506
        self.server = self.create_server()
507
507
        self._server_thread = TestThread(
508
 
            event=self.server.started,
 
508
            sync_event=self.server.started,
509
509
            target=self.run_server)
510
510
        self._server_thread.start()
511
511
        # Wait for the server thread to start (i.e release the lock)
521
521
        self._server_thread.pending_exception()
522
522
        # From now on, we'll use a different event to ensure the server can set
523
523
        # its exception
524
 
        self._server_thread.set_ready_event(self.server.stopped)
 
524
        self._server_thread.set_sync_event(self.server.stopped)
525
525
 
526
526
    def run_server(self):
527
527
        self.server.serve()