← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/https_server.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-23 19:08:05 UTC
  • mfrom: (6437.3.20 2.5)
  • mto: This revision was merged to the branch mainline in revision 6450.
  • Revision ID: jelmer@samba.org-20120123190805-hlcuihkt2dep44cw
merge bzr 2.5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/https_server.py
49
49
        serving = test_server.TestingTCPServerMixin.verify_request(
50
50
            self, request, client_address)
51
51
        if serving:
52
 
            request.do_handshake()
 
52
            try:
 
53
                request.do_handshake()
 
54
            except ssl.SSLError, e:
 
55
                # FIXME: We proabaly want more tests to capture which ssl
 
56
                # errors are worth reporting but mostly our tests want an https
 
57
                # server that works -- vila 2012-01-19
 
58
                return False
53
59
        return serving
54
60
 
55
61
    def ignored_exceptions_during_shutdown(self, e):