/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 bzrlib/benchmarks/bench_log.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:
bzrlib/benchmarks/bench_log.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""Tests for tree transform performance"""
18
18
 
26
26
from bzrlib.transform import TreeTransform
27
27
from bzrlib.workingtree import WorkingTree
28
28
 
29
 
 
30
29
class LinesDone(Exception):
31
 
    """Raised when `LineConsumer` reaches the required number of lines."""
32
30
    pass
33
31
 
34
 
 
35
32
class LineConsumer(object):
36
 
    """Count lines that are produced.
37
 
 
38
 
    When the required number of lines have been reached, raise `LinesDone`.
39
 
    """
40
33
 
41
34
    def __init__(self, required_lines):
42
 
        """Create a new consumer.
43
 
 
44
 
        :param required_lines: How many lines must be produced.
45
 
        :type required_lines: integer
46
 
        """
47
35
        self.required_lines = required_lines
48
36
 
49
37
    def write(self, text):
50
 
        """Write some text to the black hole.
51
 
 
52
 
        But count how many lines have been written.
53
 
 
54
 
        :param text: A string that would be written.
55
 
        :raise LinesDone: when the required number of lines has been reached.
56
 
        :return: None
57
 
        """
58
38
        self.required_lines -= text.count('\n')
59
39
        if self.required_lines < 0:
60
40
            raise LinesDone()
61
 
 
 
41
        
62
42
 
63
43
class LogBenchmark(Benchmark):
64
 
    """Benchmarks for ``'bzr log'`` performance."""
65
44
 
66
45
    def test_log(self):
67
 
        """Run log in a many-commit tree."""
 
46
        """Run log in a many-commit tree.""" 
68
47
        tree = self.make_many_commit_tree(hardlink=True)
69
48
        lf = log_formatter('long', to_file=StringIO())
70
49
        self.time(show_log, tree.branch, lf, direction='reverse')
101
80
        self.time(log_screenful)
102
81
 
103
82
    def test_cmd_log(self):
104
 
        """Test execution of the log command."""
 
83
        """Test execution of the log command.""" 
105
84
        tree = self.make_many_commit_tree(hardlink=True)
106
 
        self.time(self.run_bzr, ['log', '-r', '-4..'])
 
85
        self.time(self.run_bzr, 'log', '-r', '-4..')
107
86
 
108
87
    def test_cmd_log_subprocess(self):
109
 
        """Text startup and execution of the log command."""
 
88
        """Text startup and execution of the log command.""" 
110
89
        tree = self.make_many_commit_tree(hardlink=True)
111
90
        self.time(self.run_bzr_subprocess, 'log', '-r', '-4..')
112
91