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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-05-05 16:58:40 UTC
  • mfrom: (6929.11.2 urllib3)
  • Revision ID: breezy.the.bot@gmail.com-20180505165840-3a69fitc2f4n7vf9
Integrate the urllib-specific bits into the main HttpTransport.

Merged from https://code.launchpad.net/~jelmer/brz/urllib-integration/+merge/342487

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_http.py
65
65
    remote,
66
66
    )
67
67
from ..transport.http import (
68
 
    _urllib,
 
68
    HttpTransport,
69
69
    _urllib2_wrappers,
70
70
    )
71
71
 
76
76
def vary_by_http_client_implementation():
77
77
    """Test the libraries we can use, currently just urllib."""
78
78
    transport_scenarios = [
79
 
        ('urllib', dict(_transport=_urllib.HttpTransport_urllib,
80
 
                        _server=http_server.HttpServer_urllib,
81
 
                        _url_protocol='http+urllib',)),
 
79
        ('urllib', dict(_transport=HttpTransport,
 
80
                        _server=http_server.HttpServer,
 
81
                        _url_protocol='http',)),
82
82
        ]
83
83
    return transport_scenarios
84
84
 
124
124
def vary_by_http_activity():
125
125
    activity_scenarios = [
126
126
        ('urllib,http', dict(_activity_server=ActivityHTTPServer,
127
 
                            _transport=_urllib.HttpTransport_urllib,)),
 
127
                            _transport=HttpTransport,)),
128
128
        ]
129
129
    if features.HTTPSServerFeature.available():
130
130
        # FIXME: Until we have a better way to handle self-signed certificates
134
134
        from . import (
135
135
            ssl_certs,
136
136
            )
137
 
        class HTTPS_urllib_transport(_urllib.HttpTransport_urllib):
 
137
        class HTTPS_transport(HttpTransport):
138
138
 
139
139
            def __init__(self, base, _from_transport=None):
140
 
                super(HTTPS_urllib_transport, self).__init__(
 
140
                super(HTTPS_transport, self).__init__(
141
141
                    base, _from_transport=_from_transport,
142
142
                    ca_certs=ssl_certs.build_path('ca.crt'))
143
143
 
144
144
        activity_scenarios.append(
145
145
            ('urllib,https', dict(_activity_server=ActivityHTTPSServer,
146
 
                                  _transport=HTTPS_urllib_transport,)),)
 
146
                                  _transport=HTTPS_transport,)),)
147
147
    return activity_scenarios
148
148
 
149
149
 
509
509
        offsets = [ (start, end - start + 1) for start, end in ranges]
510
510
        coalesce = transport.Transport._coalesce_offsets
511
511
        coalesced = list(coalesce(offsets, limit=0, fudge_factor=0))
512
 
        range_header = http.HttpTransportBase._range_header
 
512
        range_header = http.HttpTransport._range_header
513
513
        self.assertEqual(value, range_header(coalesced, tail))
514
514
 
515
515
    def test_range_header_single(self):
2142
2142
 
2143
2143
    def setUp(self):
2144
2144
        super(TestNoReportActivity, self).setUp()
2145
 
        self._transport =_urllib.HttpTransport_urllib
 
2145
        self._transport =HttpTransport
2146
2146
        TestActivityMixin.setUp(self)
2147
2147
 
2148
2148
    def assertActivitiesMatch(self):
2159
2159
    _password_prompt_prefix = ''
2160
2160
    _username_prompt_prefix = ''
2161
2161
    _auth_server = http_utils.HTTPBasicAuthServer
2162
 
    _transport = _urllib.HttpTransport_urllib
 
2162
    _transport = HttpTransport
2163
2163
 
2164
2164
    def setUp(self):
2165
2165
        super(TestAuthOnRedirected, self).setUp()