/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: Breezy landing bot
  • Author(s): Vincent Ladeuil
  • Date: 2019-11-19 20:32:00 UTC
  • mfrom: (7413.1.2 trunk)
  • Revision ID: breezy.the.bot@gmail.com-20191119203200-fy55qqighr2xkr8r
Merge lp:brz/3.0 after 3.0.2 release.

Merged from https://code.launchpad.net/~vila/brz/trunk/+merge/375724

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
 
252
256
    def join(self, timeout=5):
253
257
        """Overrides to use a default timeout.
254
258
 
256
260
        serving a client connection is hung.
257
261
        """
258
262
        super(TestThread, self).join(timeout)
259
 
        if timeout and self.isAlive():
 
263
        if timeout and self.is_alive():
260
264
            # The timeout expired without joining the thread, the thread is
261
265
            # therefore stucked and that's a failure as far as the test is
262
266
            # concerned. We used to hang here.