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

  • Committer: John Arbash Meinel
  • Date: 2009-06-18 18:18:36 UTC
  • mto: This revision was merged to the branch mainline in revision 4461.
  • Revision ID: john@arbash-meinel.com-20090618181836-biodfkat9a8eyzjz
The new add_inventory_by_delta is returning a CHKInventory when mapping from NULL
Which is completely valid, but 'broke' one of the tests.
So to fix it, changed the test to use CHKInventories on both sides, and add an __eq__
member. The nice thing is that CHKInventory.__eq__ is fairly cheap, since it only
has to check the root keys.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/https_server.py
 
1
# Copyright (C) 2007 Canonical Ltd
 
2
#
 
3
# This program is free software; you can redistribute it and/or modify
 
4
# it under the terms of the GNU General Public License as published by
 
5
# the Free Software Foundation; either version 2 of the License, or
 
6
# (at your option) any later version.
 
7
#
 
8
# This program is distributed in the hope that it will be useful,
 
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
11
# GNU General Public License for more details.
 
12
#
 
13
# You should have received a copy of the GNU General Public License
 
14
# along with this program; if not, write to the Free Software
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
16
 
 
17
"""HTTPS test server, available when ssl python module is available"""
 
18
 
 
19
import ssl
 
20
 
 
21
from bzrlib.tests import (
 
22
    http_server,
 
23
    ssl_certs,
 
24
    )
 
25
 
 
26
 
 
27
class TestingHTTPSServerMixin:
 
28
 
 
29
    def __init__(self, key_file, cert_file):
 
30
        self.key_file = key_file
 
31
        self.cert_file = cert_file
 
32
 
 
33
    def get_request (self):
 
34
        """Get the request and client address from the socket.
 
35
 
 
36
        This is called in response to a connection issued to the server, we
 
37
        wrap the socket with SSL.
 
38
        """
 
39
        sock, addr = self.socket.accept()
 
40
        sslconn = ssl.wrap_socket(sock, server_side=True,
 
41
                                  keyfile=self.key_file,
 
42
                                  certfile=self.cert_file)
 
43
        return sslconn, addr
 
44
 
 
45
 
 
46
class TestingHTTPSServer(TestingHTTPSServerMixin,
 
47
                         http_server.TestingHTTPServer):
 
48
 
 
49
    def __init__(self, server_address, request_handler_class,
 
50
                 test_case_server, key_file, cert_file):
 
51
        TestingHTTPSServerMixin.__init__(self, key_file, cert_file)
 
52
        http_server.TestingHTTPServer.__init__(
 
53
            self, server_address, request_handler_class, test_case_server)
 
54
 
 
55
 
 
56
class TestingThreadingHTTPSServer(TestingHTTPSServerMixin,
 
57
                                  http_server.TestingThreadingHTTPServer):
 
58
 
 
59
    def __init__(self, server_address, request_handler_class,
 
60
                 test_case_server, key_file, cert_file):
 
61
        TestingHTTPSServerMixin.__init__(self, key_file, cert_file)
 
62
        http_server.TestingThreadingHTTPServer.__init__(
 
63
            self, server_address, request_handler_class, test_case_server)
 
64
 
 
65
 
 
66
class HTTPSServer(http_server.HttpServer):
 
67
 
 
68
    _url_protocol = 'https'
 
69
 
 
70
    # The real servers depending on the protocol
 
71
    http_server_class = {'HTTP/1.0': TestingHTTPSServer,
 
72
                         'HTTP/1.1': TestingThreadingHTTPSServer,
 
73
                         }
 
74
 
 
75
    # Provides usable defaults since an https server requires both a
 
76
    # private key and certificate to work.
 
77
    def __init__(self, request_handler=http_server.TestingHTTPRequestHandler,
 
78
                 protocol_version=None,
 
79
                 key_file=ssl_certs.build_path('server_without_pass.key'),
 
80
                 cert_file=ssl_certs.build_path('server.crt')):
 
81
        http_server.HttpServer.__init__(self, request_handler=request_handler,
 
82
                                        protocol_version=protocol_version)
 
83
        self.key_file = key_file
 
84
        self.cert_file = cert_file
 
85
        self.temp_files = []
 
86
 
 
87
    def create_httpd(self, serv_cls, rhandler_cls):
 
88
        return serv_cls((self.host, self.port), self.request_handler,
 
89
                        self, self.key_file, self.cert_file)
 
90
 
 
91
 
 
92
class HTTPSServer_urllib(HTTPSServer):
 
93
    """Subclass of HTTPSServer that gives https+urllib urls.
 
94
 
 
95
    This is for use in testing: connections to this server will always go
 
96
    through urllib where possible.
 
97
    """
 
98
 
 
99
    # urls returned by this server should require the urllib client impl
 
100
    _url_protocol = 'https+urllib'
 
101
 
 
102
 
 
103
class HTTPSServer_PyCurl(HTTPSServer):
 
104
    """Subclass of HTTPSServer that gives http+pycurl urls.
 
105
 
 
106
    This is for use in testing: connections to this server will always go
 
107
    through pycurl where possible.
 
108
    """
 
109
 
 
110
    # We don't care about checking the pycurl availability as
 
111
    # this server will be required only when pycurl is present
 
112
 
 
113
    # urls returned by this server should require the pycurl client impl
 
114
    _url_protocol = 'https+pycurl'