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

  • Committer: Jelmer Vernooij
  • Date: 2017-10-27 09:03:47 UTC
  • mfrom: (6798.1.1 escaping)
  • Revision ID: jelmer@jelmer.uk-20171027090347-yxa0xg7rwftar05a
Merge lp:~jelmer/brz/escaping.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/https_server.py
59
59
        return serving
60
60
 
61
61
    def ignored_exceptions_during_shutdown(self, e):
62
 
        if (sys.version < (2, 7) and isinstance(e, TypeError)
63
 
            and e.args[0] == "'member_descriptor' object is not callable"):
64
 
            # Fixed in python-2.7 (and some Ubuntu 2.6) there is a bug where
65
 
            # the ssl socket fail to raise a socket.error when trying to read
66
 
            # from a closed socket. This is rarely observed in practice but
67
 
            # still make valid selftest runs fail if not caught.
68
 
            return True
69
62
        base = test_server.TestingTCPServerMixin
70
63
        return base.ignored_exceptions_during_shutdown(self, e)
71
64