~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_http.py

  • Committer: Vincent Ladeuil
  • Date: 2016-01-21 17:48:07 UTC
  • mto: This revision was merged to the branch mainline in revision 6613.
  • Revision ID: v.ladeuil+lp@free.fr-20160121174807-g4ybpaij9ln5wj6a
Make all transport put_bytes() raises TypeError when given unicode strings rather than bytes.

There was a mix of AssertionError or UnicodeEncodeError.

Also deleted test_put_file_unicode() which was bogus, files contain bytes not unicode strings.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2005-2011 Canonical Ltd
 
1
# Copyright (C) 2005-2012, 2015 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
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
        ]
131
 
    if tests.HTTPSServerFeature.available():
132
 
        activity_scenarios.append(
133
 
            ('urllib,https', dict(_activity_server=ActivityHTTPSServer,
134
 
                                _transport=_urllib.HttpTransport_urllib,)),)
135
130
    if features.pycurl.available():
136
131
        activity_scenarios.append(
137
132
            ('pycurl,http', dict(_activity_server=ActivityHTTPServer,
138
133
                                _transport=PyCurlTransport,)),)
139
 
        if tests.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.
 
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
 
 
149
        activity_scenarios.append(
 
150
            ('urllib,https', dict(_activity_server=ActivityHTTPSServer,
 
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
 
533
521
    scenarios = vary_by_http_client_implementation()
534
522
 
535
523
    def test_http_registered(self):
536
 
        t = transport.get_transport('%s://foo.com/' % self._url_protocol)
 
524
        t = transport.get_transport_from_url(
 
525
            '%s://foo.com/' % self._url_protocol)
537
526
        self.assertIsInstance(t, transport.Transport)
538
527
        self.assertIsInstance(t, self._transport)
539
528
 
551
540
        self.start_server(server)
552
541
        url = server.get_url()
553
542
        # FIXME: needs a cleanup -- vila 20100611
554
 
        http_transport = transport.get_transport(url)
 
543
        http_transport = transport.get_transport_from_url(url)
555
544
        code, response = http_transport._post('abc def end-of-body')
556
545
        self.assertTrue(
557
546
            server.received_bytes.startswith('POST /.bzr/smart HTTP/1.'))
667
656
 
668
657
    _req_handler_class = BadStatusRequestHandler
669
658
 
 
659
    def setUp(self):
 
660
        super(TestBadStatusServer, self).setUp()
 
661
        # See https://bugs.launchpad.net/bzr/+bug/1451448 for details.
 
662
        # TD;LR: Running both a TCP client and server in the same process and
 
663
        # thread uncovers a race in python. The fix is to run the server in a
 
664
        # different process. Trying to fix yet another race here is not worth
 
665
        # the effort. -- vila 2015-09-06
 
666
        if 'HTTP/1.0' in self.id():
 
667
            raise tests.TestSkipped(
 
668
                'Client/Server in the same process and thread can hang')
 
669
 
670
670
    def test_http_has(self):
671
671
        t = self.get_readonly_transport()
672
 
        self.assertRaises(errors.InvalidHttpResponse, t.has, 'foo/bar')
 
672
        self.assertRaises((errors.ConnectionError, errors.ConnectionReset,
 
673
                           errors.InvalidHttpResponse),
 
674
                          t.has, 'foo/bar')
673
675
 
674
676
    def test_http_get(self):
675
677
        t = self.get_readonly_transport()
676
 
        self.assertRaises(errors.InvalidHttpResponse, t.get, 'foo/bar')
 
678
        self.assertRaises((errors.ConnectionError, errors.ConnectionReset,
 
679
                           errors.InvalidHttpResponse),
 
680
                          t.get, 'foo/bar')
677
681
 
678
682
 
679
683
class InvalidStatusRequestHandler(http_server.TestingHTTPRequestHandler):
1048
1052
        self.assertEqual('single', t._range_hint)
1049
1053
 
1050
1054
 
 
1055
class TruncatedBeforeBoundaryRequestHandler(
 
1056
    http_server.TestingHTTPRequestHandler):
 
1057
    """Truncation before a boundary, like in bug 198646"""
 
1058
 
 
1059
    _truncated_ranges = 1
 
1060
 
 
1061
    def get_multiple_ranges(self, file, file_size, ranges):
 
1062
        self.send_response(206)
 
1063
        self.send_header('Accept-Ranges', 'bytes')
 
1064
        boundary = 'tagada'
 
1065
        self.send_header('Content-Type',
 
1066
                         'multipart/byteranges; boundary=%s' % boundary)
 
1067
        boundary_line = '--%s\r\n' % boundary
 
1068
        # Calculate the Content-Length
 
1069
        content_length = 0
 
1070
        for (start, end) in ranges:
 
1071
            content_length += len(boundary_line)
 
1072
            content_length += self._header_line_length(
 
1073
                'Content-type', 'application/octet-stream')
 
1074
            content_length += self._header_line_length(
 
1075
                'Content-Range', 'bytes %d-%d/%d' % (start, end, file_size))
 
1076
            content_length += len('\r\n') # end headers
 
1077
            content_length += end - start # + 1
 
1078
        content_length += len(boundary_line)
 
1079
        self.send_header('Content-length', content_length)
 
1080
        self.end_headers()
 
1081
 
 
1082
        # Send the multipart body
 
1083
        cur = 0
 
1084
        for (start, end) in ranges:
 
1085
            if cur + self._truncated_ranges >= len(ranges):
 
1086
                # Abruptly ends the response and close the connection
 
1087
                self.close_connection = 1
 
1088
                return
 
1089
            self.wfile.write(boundary_line)
 
1090
            self.send_header('Content-type', 'application/octet-stream')
 
1091
            self.send_header('Content-Range', 'bytes %d-%d/%d'
 
1092
                             % (start, end, file_size))
 
1093
            self.end_headers()
 
1094
            self.send_range_content(file, start, end - start + 1)
 
1095
            cur += 1
 
1096
        # Final boundary
 
1097
        self.wfile.write(boundary_line)
 
1098
 
 
1099
 
 
1100
class TestTruncatedBeforeBoundary(TestSpecificRequestHandler):
 
1101
    """Tests the case of bug 198646, disconnecting before a boundary."""
 
1102
 
 
1103
    _req_handler_class = TruncatedBeforeBoundaryRequestHandler
 
1104
 
 
1105
    def setUp(self):
 
1106
        super(TestTruncatedBeforeBoundary, self).setUp()
 
1107
        self.build_tree_contents([('a', '0123456789')],)
 
1108
 
 
1109
    def test_readv_with_short_reads(self):
 
1110
        server = self.get_readonly_server()
 
1111
        t = self.get_readonly_transport()
 
1112
        # Force separate ranges for each offset
 
1113
        t._bytes_to_read_before_seek = 0
 
1114
        ireadv = iter(t.readv('a', ((0, 1), (2, 1), (4, 2), (9, 1))))
 
1115
        self.assertEqual((0, '0'), ireadv.next())
 
1116
        self.assertEqual((2, '2'), ireadv.next())
 
1117
        self.assertEqual((4, '45'), ireadv.next())
 
1118
        self.assertEqual((9, '9'), ireadv.next())
 
1119
 
 
1120
 
1051
1121
class LimitedRangeRequestHandler(http_server.TestingHTTPRequestHandler):
1052
1122
    """Errors out when range specifiers exceed the limit"""
1053
1123
 
1090
1160
                                      protocol_version=self._protocol_version)
1091
1161
 
1092
1162
    def setUp(self):
1093
 
        http_utils.TestCaseWithWebserver.setUp(self)
 
1163
        super(TestLimitedRangeRequestServer, self).setUp()
1094
1164
        # We need to manipulate ranges that correspond to real chunks in the
1095
1165
        # response, so we build a content appropriately.
1096
1166
        filler = ''.join(['abcdefghij' for x in range(102)])
1282
1352
        )
1283
1353
 
1284
1354
    def setUp(self):
1285
 
        http_utils.TestCaseWithWebserver.setUp(self)
 
1355
        super(TestRanges, self).setUp()
1286
1356
        self.build_tree_contents([('a', '0123456789')],)
1287
1357
 
1288
1358
    def create_transport_readonly_server(self):
1569
1639
        return url
1570
1640
 
1571
1641
    def get_user_transport(self, user, password):
1572
 
        t = transport.get_transport(self.get_user_url(user, password))
 
1642
        t = transport.get_transport_from_url(
 
1643
            self.get_user_url(user, password))
1573
1644
        return t
1574
1645
 
1575
1646
    def test_no_user(self):
1701
1772
                                     http_utils.ProxyDigestAuthServer):
1702
1773
            raise tests.TestNotApplicable('HTTP/proxy auth digest only test')
1703
1774
        if self._testing_pycurl():
1704
 
            raise tests.KnownFailure(
 
1775
            self.knownFailure(
1705
1776
                'pycurl does not handle a nonce change')
1706
1777
        self.server.add_user('joe', 'foo')
1707
1778
        t = self.get_user_transport('joe', 'foo')
1789
1860
        if self._testing_pycurl():
1790
1861
            import pycurl
1791
1862
            if pycurl.version_info()[1] < '7.16.0':
1792
 
                raise tests.KnownFailure(
 
1863
                self.knownFailure(
1793
1864
                    'pycurl < 7.16.0 does not handle empty proxy passwords')
1794
1865
        super(TestProxyAuth, self).test_empty_pass()
1795
1866
 
1837
1908
        server._url_protocol = self._url_protocol
1838
1909
        return server
1839
1910
 
1840
 
    def test_open_bzrdir(self):
 
1911
    def test_open_controldir(self):
1841
1912
        branch = self.make_branch('relpath')
1842
1913
        url = self.http_server.get_url() + 'relpath'
1843
 
        bd = bzrdir.BzrDir.open(url)
 
1914
        bd = controldir.ControlDir.open(url)
1844
1915
        self.addCleanup(bd.transport.disconnect)
1845
1916
        self.assertIsInstance(bd, _mod_remote.RemoteBzrDir)
1846
1917
 
1849
1920
        # The 'readv' command in the smart protocol both sends and receives
1850
1921
        # bulk data, so we use that.
1851
1922
        self.build_tree(['data-file'])
1852
 
        http_transport = transport.get_transport(self.http_server.get_url())
 
1923
        http_transport = transport.get_transport_from_url(
 
1924
            self.http_server.get_url())
1853
1925
        medium = http_transport.get_smart_medium()
1854
1926
        # Since we provide the medium, the url below will be mostly ignored
1855
1927
        # during the test, as long as the path is '/'.
1863
1935
        post_body = 'hello\n'
1864
1936
        expected_reply_body = 'ok\x012\n'
1865
1937
 
1866
 
        http_transport = transport.get_transport(self.http_server.get_url())
 
1938
        http_transport = transport.get_transport_from_url(
 
1939
            self.http_server.get_url())
1867
1940
        medium = http_transport.get_smart_medium()
1868
1941
        response = medium.send_http_smart_request(post_body)
1869
1942
        reply_body = response.read()
1927
2000
        self.assertIsInstance(r, type(t))
1928
2001
        # Both transports share the some connection
1929
2002
        self.assertEqual(t._get_connection(), r._get_connection())
 
2003
        self.assertEquals('http://www.example.com/foo/subdir/', r.base)
1930
2004
 
1931
2005
    def test_redirected_to_self_with_slash(self):
1932
2006
        t = self._transport('http://www.example.com/foo')
1943
2017
        r = t._redirected_to('http://www.example.com/foo',
1944
2018
                             'http://foo.example.com/foo/subdir')
1945
2019
        self.assertIsInstance(r, type(t))
 
2020
        self.assertEquals('http://foo.example.com/foo/subdir/',
 
2021
            r.external_url())
1946
2022
 
1947
2023
    def test_redirected_to_same_host_sibling_protocol(self):
1948
2024
        t = self._transport('http://www.example.com/foo')
1949
2025
        r = t._redirected_to('http://www.example.com/foo',
1950
2026
                             'https://www.example.com/foo')
1951
2027
        self.assertIsInstance(r, type(t))
 
2028
        self.assertEquals('https://www.example.com/foo/',
 
2029
            r.external_url())
1952
2030
 
1953
2031
    def test_redirected_to_same_host_different_protocol(self):
1954
2032
        t = self._transport('http://www.example.com/foo')
1955
2033
        r = t._redirected_to('http://www.example.com/foo',
1956
2034
                             'ftp://www.example.com/foo')
1957
2035
        self.assertNotEquals(type(r), type(t))
 
2036
        self.assertEquals('ftp://www.example.com/foo/', r.external_url())
 
2037
 
 
2038
    def test_redirected_to_same_host_specific_implementation(self):
 
2039
        t = self._transport('http://www.example.com/foo')
 
2040
        r = t._redirected_to('http://www.example.com/foo',
 
2041
                             'https+urllib://www.example.com/foo')
 
2042
        self.assertEquals('https://www.example.com/foo/', r.external_url())
1958
2043
 
1959
2044
    def test_redirected_to_different_host_same_user(self):
1960
2045
        t = self._transport('http://joe@www.example.com/foo')
1961
2046
        r = t._redirected_to('http://www.example.com/foo',
1962
2047
                             'https://foo.example.com/foo')
1963
2048
        self.assertIsInstance(r, type(t))
1964
 
        self.assertEqual(t._user, r._user)
 
2049
        self.assertEqual(t._parsed_url.user, r._parsed_url.user)
 
2050
        self.assertEquals('https://joe@foo.example.com/foo/', r.external_url())
1965
2051
 
1966
2052
 
1967
2053
class PredefinedRequestHandler(http_server.TestingHTTPRequestHandler):
2020
2106
    pass
2021
2107
 
2022
2108
 
2023
 
if tests.HTTPSServerFeature.available():
 
2109
if features.HTTPSServerFeature.available():
2024
2110
    from bzrlib.tests import https_server
2025
2111
    class ActivityHTTPSServer(ActivityServerMixin, https_server.HTTPSServer):
2026
2112
        pass
2034
2120
    """
2035
2121
 
2036
2122
    def setUp(self):
2037
 
        tests.TestCase.setUp(self)
2038
2123
        self.server = self._activity_server(self._protocol_version)
2039
2124
        self.server.start_server()
 
2125
        self.addCleanup(self.server.stop_server)
2040
2126
        _activities = {} # Don't close over self and create a cycle
2041
2127
        def report_activity(t, bytes, direction):
2042
2128
            count = _activities.get(direction, 0)
2043
2129
            count += bytes
2044
2130
            _activities[direction] = count
2045
2131
        self.activities = _activities
2046
 
 
2047
2132
        # We override at class level because constructors may propagate the
2048
2133
        # bound method and render instance overriding ineffective (an
2049
2134
        # alternative would be to define a specific ui factory instead...)
2050
2135
        self.overrideAttr(self._transport, '_report_activity', report_activity)
2051
 
        self.addCleanup(self.server.stop_server)
2052
2136
 
2053
2137
    def get_transport(self):
2054
2138
        t = self._transport(self.server.get_url())
2178
2262
        )
2179
2263
 
2180
2264
    def setUp(self):
 
2265
        super(TestActivity, self).setUp()
2181
2266
        TestActivityMixin.setUp(self)
2182
2267
 
2183
2268
 
2192
2277
    _protocol_version = 'HTTP/1.1'
2193
2278
 
2194
2279
    def setUp(self):
 
2280
        super(TestNoReportActivity, self).setUp()
2195
2281
        self._transport =_urllib.HttpTransport_urllib
2196
2282
        TestActivityMixin.setUp(self)
2197
2283