~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/http/_pycurl.py

  • Committer: Vincent Ladeuil
  • Date: 2009-01-30 00:49:41 UTC
  • mto: (3982.1.1 bzr.integration)
  • mto: This revision was merged to the branch mainline in revision 3983.
  • Revision ID: v.ladeuil+lp@free.fr-20090130004941-820fpd2ryyo127vv
Add more tests, fix pycurl double handling, revert previous tracking.

* bzrlib/tests/test_http.py:
(PredefinedRequestHandler): Renamed from
PreRecordedRequestHandler.
(PredefinedRequestHandler.handle_one_request): Get the canned
response from the test server directly.
(ActivityServerMixin): Make it a true object and intialize the
attributes in the constructor. Tests can now set the
canned_response attribute before querying the server.
(TestActivity.setUp, TestActivity.tearDown,
TestActivity.get_transport, TestActivity.assertActivitiesMatch):
Extracted from test_get to be able to write other tests.
(TestActivity.test_has, TestActivity.test_readv,
TestActivity.test_post): New tests, all cases should be covered
now.

* bzrlib/transport/http/response.py:
(RangeFile.__init__, RangeFile.read, handle_response): Revert
previous tracking, both http implementations can now report
activity from the socket.

* bzrlib/transport/http/_pycurl.py:
(PyCurlTransport._get_ranged, PyCurlTransport._post): Revert
previous tracking.

Show diffs side-by-side

added added

removed removed

Lines of Context:
245
245
                                          'Server return code %d'
246
246
                                          % curl.getinfo(pycurl.HTTP_CODE))
247
247
        msg = self._parse_headers(header)
248
 
        return code, response.handle_response(abspath, code, msg, data,
249
 
            report_activity=self._report_activity)
 
248
        return code, response.handle_response(abspath, code, msg, data)
250
249
 
251
250
    def _parse_headers(self, status_and_headers):
252
251
        """Transform the headers provided by curl into an HTTPMessage"""
286
285
        data.seek(0)
287
286
        code = curl.getinfo(pycurl.HTTP_CODE)
288
287
        msg = self._parse_headers(header)
289
 
        return code, response.handle_response(abspath, code, msg, data,
290
 
            report_activity=self._report_activity)
 
288
        return code, response.handle_response(abspath, code, msg, data)
291
289
 
292
290
 
293
291
    def _raise_curl_http_error(self, curl, info=None):