~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_http.py

  • Committer: v.ladeuil+lp at free
  • Date: 2006-12-01 15:06:29 UTC
  • mto: (2172.3.1 bzr.73948)
  • mto: This revision was merged to the branch mainline in revision 2181.
  • Revision ID: v.ladeuil+lp@free.fr-20061201150629-zjd2an87u0r7nhhw
The tests that would have help avoid bug #73948 and all that mess :)

* bzrlib/transport/http/response.py:
(handle_response): Translate a 416 http error code into a bzr
exception.

* bzrlib/transport/http/_urllib2_wrappers.py:
(HTTPDefaultErrorHandler.http_error_default): Translate a 416 http
error code into a bzr exception.

* bzrlib/transport/http/_pycurl.py:
(PyCurlTransport._curl_perform): It could happen that pycrul
itself detect a short read.

* bzrlib/transport/http/__init__.py:
(HttpTransportBase._retry_get): New method, factorizing the retry
logic.
(HttpTransportBase.readv): We can have exception during the
initial GET worth degrading the range requirements (i.e. retrying
the GET request with either single or not ranges).

* bzrlib/tests/test_transport_implementations.py:
(TransportTests.test_readv_short_read): InvalidRange can also be
raised.

* bzrlib/tests/test_http.py:
(TestRangeRequestServer.test_readv_invalid_ranges): Was named
test_readv_short_read, the new name make the intent
clearer. Depending of the code path used (urllib or pycurl), both
exceptions can be raised.

* bzrlib/tests/HttpServer.py:
(TestingHTTPRequestHandler.do_GET): If invalid ranges are
specified, returns a 416 instead of the whole file (both are valid
according to the RFC).

Show diffs side-by-side

added added

removed removed

Lines of Context:
566
566
        self.assertEqual(l[2], (0, '0'))
567
567
        self.assertEqual(l[3], (3, '34'))
568
568
 
569
 
    def test_readv_short_read(self):
 
569
    def test_readv_invalid_ranges(self):
570
570
        server = self.get_readonly_server()
571
571
        t = self._transport(server.get_url())
572
572
 
573
573
        # This is intentionally reading off the end of the file
574
574
        # since we are sure that it cannot get there
575
 
        self.assertListRaises((errors.ShortReadvError, AssertionError),
 
575
        self.assertListRaises((errors.InvalidRange, errors.ShortReadvError,),
576
576
                              t.readv, 'a', [(1,1), (8,10)])
577
577
 
578
578
        # This is trying to seek past the end of the file, it should
579
579
        # also raise a special error
580
 
        self.assertListRaises(errors.ShortReadvError,
 
580
        self.assertListRaises((errors.InvalidRange, errors.ShortReadvError,),
581
581
                              t.readv, 'a', [(12,2)])
582
582
 
583
583