← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_http.py

  • Committer: Patch Queue Manager
  • Date: 2014-04-09 13:36:25 UTC
  • mfrom: (6592.1.2 1303879-py27-issues)
  • Revision ID: pqm@pqm.ubuntu.com-20140409133625-s24spv3kha2w2860
(vila) Fix python-2.7.6 test failures. (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_http.py
31
31
 
32
32
import bzrlib
33
33
from bzrlib import (
34
 
    bzrdir,
35
 
    cethread,
36
34
    config,
 
35
    controldir,
37
36
    debug,
38
37
    errors,
39
38
    osutils,
128
127
        ('urllib,http', dict(_activity_server=ActivityHTTPServer,
129
128
                            _transport=_urllib.HttpTransport_urllib,)),
130
129
        ]
 
130
    if features.pycurl.available():
 
131
        activity_scenarios.append(
 
132
            ('pycurl,http', dict(_activity_server=ActivityHTTPServer,
 
133
                                _transport=PyCurlTransport,)),)
131
134
    if features.HTTPSServerFeature.available():
 
135
        # FIXME: Until we have a better way to handle self-signed certificates
 
136
        # (like allowing them in a test specific authentication.conf for
 
137
        # example), we need some specialized pycurl/urllib transport for tests.
 
138
        # -- vila 2012-01-20
 
139
        from bzrlib.tests import (
 
140
            ssl_certs,
 
141
            )
 
142
        class HTTPS_urllib_transport(_urllib.HttpTransport_urllib):
 
143
 
 
144
            def __init__(self, base, _from_transport=None):
 
145
                super(HTTPS_urllib_transport, self).__init__(
 
146
                    base, _from_transport=_from_transport,
 
147
                    ca_certs=ssl_certs.build_path('ca.crt'))
 
148
 
132
149
        activity_scenarios.append(
133
150
            ('urllib,https', dict(_activity_server=ActivityHTTPSServer,
134
 
                                _transport=_urllib.HttpTransport_urllib,)),)
135
 
    if features.pycurl.available():
136
 
        activity_scenarios.append(
137
 
            ('pycurl,http', dict(_activity_server=ActivityHTTPServer,
138
 
                                _transport=PyCurlTransport,)),)
139
 
        if features.HTTPSServerFeature.available():
140
 
            from bzrlib.tests import (
141
 
                ssl_certs,
142
 
                )
143
 
            # FIXME: Until we have a better way to handle self-signed
144
 
            # certificates (like allowing them in a test specific
145
 
            # authentication.conf for example), we need some specialized pycurl
146
 
            # transport for tests.
 
151
                                  _transport=HTTPS_urllib_transport,)),)
 
152
        if features.pycurl.available():
147
153
            class HTTPS_pycurl_transport(PyCurlTransport):
148
154
 
149
155
                def __init__(self, base, _from_transport=None):
378
384
    _transport = property(_get_pycurl_maybe)
379
385
 
380
386
 
381
 
class TestHttpUrls(tests.TestCase):
382
 
 
383
 
    # TODO: This should be moved to authorization tests once they
384
 
    # are written.
385
 
 
386
 
    def test_url_parsing(self):
387
 
        f = FakeManager()
388
 
        url = http.extract_auth('http://example.com', f)
389
 
        self.assertEqual('http://example.com', url)
390
 
        self.assertEqual(0, len(f.credentials))
391
 
        url = http.extract_auth(
392
 
            'http://user:pass@example.com/bzr/bzr.dev', f)
393
 
        self.assertEqual('http://example.com/bzr/bzr.dev', url)
394
 
        self.assertEqual(1, len(f.credentials))
395
 
        self.assertEqual([None, 'example.com', 'user', 'pass'],
396
 
                         f.credentials[0])
397
 
 
398
 
 
399
387
class TestHttpTransportUrls(tests.TestCase):
400
388
    """Test the http urls."""
401
389
 
481
469
        )
482
470
 
483
471
    def setUp(self):
484
 
        http_utils.TestCaseWithWebserver.setUp(self)
 
472
        super(TestHTTPConnections, self).setUp()
485
473
        self.build_tree(['foo/', 'foo/bar'], line_endings='binary',
486
474
                        transport=self.get_transport())
487
475
 
1157
1145
                                      protocol_version=self._protocol_version)
1158
1146
 
1159
1147
    def setUp(self):
1160
 
        http_utils.TestCaseWithWebserver.setUp(self)
 
1148
        super(TestLimitedRangeRequestServer, self).setUp()
1161
1149
        # We need to manipulate ranges that correspond to real chunks in the
1162
1150
        # response, so we build a content appropriately.
1163
1151
        filler = ''.join(['abcdefghij' for x in range(102)])
1349
1337
        )
1350
1338
 
1351
1339
    def setUp(self):
1352
 
        http_utils.TestCaseWithWebserver.setUp(self)
 
1340
        super(TestRanges, self).setUp()
1353
1341
        self.build_tree_contents([('a', '0123456789')],)
1354
1342
 
1355
1343
    def create_transport_readonly_server(self):
1905
1893
        server._url_protocol = self._url_protocol
1906
1894
        return server
1907
1895
 
1908
 
    def test_open_bzrdir(self):
 
1896
    def test_open_controldir(self):
1909
1897
        branch = self.make_branch('relpath')
1910
1898
        url = self.http_server.get_url() + 'relpath'
1911
 
        bd = bzrdir.BzrDir.open(url)
 
1899
        bd = controldir.ControlDir.open(url)
1912
1900
        self.addCleanup(bd.transport.disconnect)
1913
1901
        self.assertIsInstance(bd, _mod_remote.RemoteBzrDir)
1914
1902
 
2117
2105
    """
2118
2106
 
2119
2107
    def setUp(self):
2120
 
        tests.TestCase.setUp(self)
2121
2108
        self.server = self._activity_server(self._protocol_version)
2122
2109
        self.server.start_server()
 
2110
        self.addCleanup(self.server.stop_server)
2123
2111
        _activities = {} # Don't close over self and create a cycle
2124
2112
        def report_activity(t, bytes, direction):
2125
2113
            count = _activities.get(direction, 0)
2126
2114
            count += bytes
2127
2115
            _activities[direction] = count
2128
2116
        self.activities = _activities
2129
 
 
2130
2117
        # We override at class level because constructors may propagate the
2131
2118
        # bound method and render instance overriding ineffective (an
2132
2119
        # alternative would be to define a specific ui factory instead...)
2133
2120
        self.overrideAttr(self._transport, '_report_activity', report_activity)
2134
 
        self.addCleanup(self.server.stop_server)
2135
2121
 
2136
2122
    def get_transport(self):
2137
2123
        t = self._transport(self.server.get_url())
2261
2247
        )
2262
2248
 
2263
2249
    def setUp(self):
 
2250
        super(TestActivity, self).setUp()
2264
2251
        TestActivityMixin.setUp(self)
2265
2252
 
2266
2253
 
2275
2262
    _protocol_version = 'HTTP/1.1'
2276
2263
 
2277
2264
    def setUp(self):
 
2265
        super(TestNoReportActivity, self).setUp()
2278
2266
        self._transport =_urllib.HttpTransport_urllib
2279
2267
        TestActivityMixin.setUp(self)
2280
2268