/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 breezy/tests/test_server.py

  • Committer: Jelmer Vernooij
  • Date: 2019-06-03 23:48:08 UTC
  • mfrom: (7316 work)
  • mto: This revision was merged to the branch mainline in revision 7328.
  • Revision ID: jelmer@jelmer.uk-20190603234808-15yk5c7054tj8e2b
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_server.py
249
249
 
250
250
class TestThread(cethread.CatchingExceptionThread):
251
251
 
252
 
    if not getattr(cethread.CatchingExceptionThread, 'is_alive', None):
253
 
        def is_alive(self):
254
 
            return self.isAlive()
255
 
 
256
252
    def join(self, timeout=5):
257
253
        """Overrides to use a default timeout.
258
254
 
260
256
        serving a client connection is hung.
261
257
        """
262
258
        super(TestThread, self).join(timeout)
263
 
        if timeout and self.is_alive():
 
259
        if timeout and self.isAlive():
264
260
            # The timeout expired without joining the thread, the thread is
265
261
            # therefore stucked and that's a failure as far as the test is
266
262
            # concerned. We used to hang here.