/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 tools/capture_tree.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:
tools/capture_tree.py
 
1
#! /usr/bin/env python2.4
 
2
 
 
3
# Copyright (C) 2005 Canonical Ltd
 
4
 
 
5
"""Print to stdout a description of the current directory, 
 
6
formatted as a Python data structure.
 
7
 
 
8
This can be useful in tests that need to recreate directory
 
9
contents."""
 
10
 
 
11
import sys
 
12
import os
 
13
 
 
14
from bzrlib.trace import enable_default_logging
 
15
enable_default_logging()
 
16
from bzrlib.selftest.treeshape import capture_tree_contents
 
17
 
 
18
def main(argv):
 
19
    # a lame reimplementation of pformat that splits multi-line
 
20
    # strings into concatenated string literals.
 
21
    print '['
 
22
    for tt in capture_tree_contents('.'):
 
23
        assert isinstance(tt, tuple)
 
24
        print '    (', repr(tt[0]) + ',',
 
25
        if len(tt) == 1:
 
26
            print '),'
 
27
        else:
 
28
            assert len(tt) == 2
 
29
            val = tt[1]
 
30
            print
 
31
            if val == '':
 
32
                print "        ''"
 
33
            else:
 
34
                for valline in val.splitlines(True):
 
35
                    print '       ', repr(valline)
 
36
            print '    ),'
 
37
    print ']'
 
38
 
 
39
if __name__ == '__main__':
 
40
    sys.exit(main(sys.argv))