/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-03-05 07:32:38 UTC
  • mto: (7290.1.21 work)
  • mto: This revision was merged to the branch mainline in revision 7311.
  • Revision ID: jelmer@jelmer.uk-20190305073238-zlqn981opwnqsmzi
Add appveyor configuration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_server.py
16
16
 
17
17
import errno
18
18
import socket
19
 
import socketserver
 
19
try:
 
20
    import socketserver
 
21
except ImportError:
 
22
    import SocketServer as socketserver
20
23
import sys
21
24
import threading
22
25
 
253
256
        serving a client connection is hung.
254
257
        """
255
258
        super(TestThread, self).join(timeout)
256
 
        if timeout and self.is_alive():
 
259
        if timeout and self.isAlive():
257
260
            # The timeout expired without joining the thread, the thread is
258
261
            # therefore stucked and that's a failure as far as the test is
259
262
            # concerned. We used to hang here.