/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_test_server.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-09-17 12:22:51 UTC
  • mfrom: (7121.1.1 fix-flaky)
  • Revision ID: breezy.the.bot@gmail.com-20180917122251-z2y7e42fux3db6pg
Cope with very early disconnects during TCP Server tests.

Merged from https://code.launchpad.net/~jelmer/brz/fix-flaky/+merge/355057

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_test_server.py
66
66
                self.sock.shutdown(socket.SHUT_RDWR)
67
67
                self.sock.close()
68
68
            except socket.error as e:
69
 
                if e.errno in (errno.EBADF, errno.ENOTCONN):
 
69
                if e.errno in (errno.EBADF, errno.ENOTCONN, errno.ECONNRESET):
70
70
                    # Right, the socket is already down
71
71
                    pass
72
72
                else:
291
291
        server = self.get_server()
292
292
        client = self.get_client()
293
293
        server.server.serving = False
294
 
        client.connect((server.host, server.port))
295
 
        self.assertEqual(b'', client.read())
 
294
        try:
 
295
            client.connect((server.host, server.port))
 
296
            self.assertEqual(b'', client.read())
 
297
        except socket.error as e:
 
298
            if e.errno != errno.ECONNRESET:
 
299
                raise
296
300
 
297
301
 
298
302
class TestTestingSmartServer(tests.TestCase):