~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/https_server.py

  • Committer: Vincent Ladeuil
  • Date: 2009-01-29 19:31:01 UTC
  • mto: (3982.1.1 bzr.integration)
  • mto: This revision was merged to the branch mainline in revision 3983.
  • Revision ID: v.ladeuil+lp@free.fr-20090129193101-w0008aa1ufoe7cmd
Test against https.

* bzrlib/tests/test_http.py:
(load_tests): Get rid of TestAdapter daughter classes, they are
useless. Add parametrization against http/https for activity
tests.
(ActivityServerMixin, ActivityHTTPServer, ActivityHTTPSServer):
Make HTTP[S] servers.
(PreRecordedRequestHandler.handle_one_request): Be defensive
against threads being non-deterministic.
(TestActivity.test_http_get): Use parametrized test server.

* bzrlib/tests/https_server.py:
(HTTPSServer.__init__): Add protocol_version parameter for tests
purposes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
75
75
    # Provides usable defaults since an https server requires both a
76
76
    # private key and certificate to work.
77
77
    def __init__(self, request_handler=http_server.TestingHTTPRequestHandler,
 
78
                 protocol_version=None,
78
79
                 key_file=ssl_certs.build_path('server_without_pass.key'),
79
80
                 cert_file=ssl_certs.build_path('server.crt')):
80
 
        http_server.HttpServer.__init__(self, request_handler)
 
81
        http_server.HttpServer.__init__(self, request_handler=request_handler,
 
82
                                        protocol_version=protocol_version)
81
83
        self.key_file = key_file
82
84
        self.cert_file = cert_file
83
85
        self.temp_files = []