~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_progress.py

  • Committer: Martin Pool
  • Date: 2011-04-18 03:45:05 UTC
  • mto: This revision was merged to the branch mainline in revision 5798.
  • Revision ID: mbp@sourcefrog.net-20110418034505-2yqoat6blcygx3px
Rewrite test_report_bug_legacy away from using doctest (see bug 764188)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006-2011 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
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
 
import os
19
18
from StringIO import StringIO
20
19
 
21
 
from bzrlib import errors
22
20
from bzrlib.progress import (
23
21
    ProgressTask,
24
22
    )
25
 
from bzrlib.symbol_versioning import (
26
 
    deprecated_in,
27
 
    )
28
23
from bzrlib.tests import TestCase
29
24
from bzrlib.ui.text import (
30
25
    TextProgressView,
58
53
    def make_view(self):
59
54
        out = StringIO()
60
55
        view = TextProgressView(out)
61
 
        view._width = 80
 
56
        view._avail_width = lambda: 79
62
57
        return out, view
63
58
    
64
59
    def make_task(self, parent_task, view, msg, curr, total):
70
65
        task.total_cnt = total
71
66
        return task
72
67
 
 
68
    def test_clear(self):
 
69
        # <https://bugs.launchpad.net/bzr/+bug/611127> clear must actually
 
70
        # send spaces to clear the line
 
71
        out, view = self.make_view()
 
72
        task = self.make_task(None, view, 'reticulating splines', 5, 20)
 
73
        view.show_progress(task)
 
74
        self.assertEqual(
 
75
'\r/ reticulating splines 5/20                                                    \r'
 
76
            , out.getvalue())
 
77
        view.clear()
 
78
        self.assertEqual(
 
79
'\r/ reticulating splines 5/20                                                    \r'
 
80
            + '\r' + 79 * ' ' + '\r',
 
81
            out.getvalue())
 
82
 
73
83
    def test_render_progress_no_bar(self):
74
84
        """The default view now has a spinner but no bar."""
75
85
        out, view = self.make_view()
100
110
        # so we're in the first half of the main task, and half way through
101
111
        # that
102
112
        self.assertEqual(
103
 
r'[####-               ] reticulating splines:stage2 1/2'
 
113
'[####-               ] reticulating splines:stage2 1/2                         '
104
114
            , view._render_line())
105
115
        # if the nested task is complete, then we're all the way through the
106
116
        # first half of the overall work
107
117
        task2.update('stage2', 2, 2)
108
118
        self.assertEqual(
109
 
r'[#########\          ] reticulating splines:stage2 2/2'
 
119
'[#########\          ] reticulating splines:stage2 2/2                         '
110
120
            , view._render_line())
111
121
 
112
122
    def test_render_progress_sub_nested(self):
123
133
        # progress indication, just a label; and the bottom one is half done,
124
134
        # so the overall fraction is 1/4
125
135
        self.assertEqual(
126
 
            r'[####|               ] a:b:c 1/2'
 
136
'[####|               ] a:b:c 1/2                                               '
127
137
            , view._render_line())
 
138
 
 
139
    def test_render_truncated(self):
 
140
        # when the bar is too long for the terminal, we prefer not to truncate
 
141
        # the counters because they might be interesting, and because
 
142
        # truncating the numbers might be misleading
 
143
        out, view = self.make_view()
 
144
        task_a = ProgressTask(None, progress_view=view)
 
145
        task_a.update('start_' + 'a' * 200 + '_end', 2000, 5000)
 
146
        line = view._render_line()
 
147
        self.assertEqual(
 
148
'- start_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.. 2000/5000',
 
149
           line) 
 
150
        self.assertEqual(len(line), 79)
 
151
 
 
152
 
 
153
    def test_render_with_activity(self):
 
154
        # if the progress view has activity, it's shown before the spinner
 
155
        out, view = self.make_view()
 
156
        task_a = ProgressTask(None, progress_view=view)
 
157
        view._last_transport_msg = '   123kB   100kB/s '
 
158
        line = view._render_line()
 
159
        self.assertEqual(
 
160
'   123kB   100kB/s /                                                           ',
 
161
           line) 
 
162
        self.assertEqual(len(line), 79)
 
163
 
 
164
        task_a.update('start_' + 'a' * 200 + '_end', 2000, 5000)
 
165
        view._last_transport_msg = '   123kB   100kB/s '
 
166
        line = view._render_line()
 
167
        self.assertEqual(
 
168
'   123kB   100kB/s \\ start_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.. 2000/5000',
 
169
           line) 
 
170
        self.assertEqual(len(line), 79)