/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: 2020-03-22 20:02:36 UTC
  • mto: (7490.7.7 work)
  • mto: This revision was merged to the branch mainline in revision 7501.
  • Revision ID: jelmer@jelmer.uk-20200322200236-fsbl91ktcn6fcbdd
Fix tests.

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
 
246
249
 
247
250
class TestThread(cethread.CatchingExceptionThread):
248
251
 
 
252
    if not getattr(cethread.CatchingExceptionThread, 'is_alive', None):
 
253
        def is_alive(self):
 
254
            return self.isAlive()
 
255
 
249
256
    def join(self, timeout=5):
250
257
        """Overrides to use a default timeout.
251
258