/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: 2018-11-12 01:41:38 UTC
  • mto: (7143.16.20 even-more-cleanups)
  • mto: This revision was merged to the branch mainline in revision 7175.
  • Revision ID: jelmer@jelmer.uk-20181112014138-3b0zyx91cu3wdq3k
More PEP8 fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_server.py
22
22
    import SocketServer as socketserver
23
23
import sys
24
24
import threading
25
 
import traceback
26
25
 
27
26
 
28
27
from breezy import (
267
266
            # platforms, this doesn't occur, so just mentioning the problem is
268
267
            # enough for now -- vila 2010824
269
268
            sys.stderr.write('thread %s hung\n' % (self.name,))
270
 
            #raise AssertionError('thread %s hung' % (self.name,))
 
269
            # raise AssertionError('thread %s hung' % (self.name,))
271
270
 
272
271
 
273
272
class TestingTCPServerMixin(object):
314
313
        if self.verify_request(request, client_address):
315
314
            try:
316
315
                self.process_request(request, client_address)
317
 
            except:
 
316
            except BaseException:
318
317
                self.handle_error(request, client_address)
319
318
        else:
320
319
            self.close_request(request)
562
561
            last_conn = None
563
562
            try:
564
563
                last_conn = osutils.connect_socket((self.host, self.port))
565
 
            except socket.error as e:
 
564
            except socket.error:
566
565
                # But ignore connection errors as the point is to unblock the
567
566
                # server thread, it may happen that it's not blocked or even
568
567
                # not started.
633
632
                 backing_transport, root_client_path):
634
633
        TestingThreadingTCPServer.__init__(self, server_address,
635
634
                                           request_handler_class)
636
 
        server.SmartTCPServer.__init__(self, backing_transport,
637
 
                                       root_client_path, client_timeout=_DEFAULT_TESTING_CLIENT_TIMEOUT)
 
635
        server.SmartTCPServer.__init__(
 
636
            self, backing_transport,
 
637
            root_client_path, client_timeout=_DEFAULT_TESTING_CLIENT_TIMEOUT)
638
638
 
639
639
    def serve(self):
640
640
        self.run_server_started_hooks()