← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_progress.py

  • Committer: John Arbash Meinel
  • Date: 2010-02-17 17:11:16 UTC
  • mfrom: (4797.2.17 2.1)
  • mto: (4797.2.18 2.1)
  • mto: This revision was merged to the branch mainline in revision 5055.
  • Revision ID: john@arbash-meinel.com-20100217171116-h7t9223ystbnx5h8
merge bzr.2.1 in preparation for NEWS entry.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_progress.py
58
58
    def make_view(self):
59
59
        out = StringIO()
60
60
        view = TextProgressView(out)
61
 
        view._avail_width = lambda: 79
 
61
        view._width = 80
62
62
        return out, view
63
63
    
64
64
    def make_task(self, parent_task, view, msg, curr, total):
70
70
        task.total_cnt = total
71
71
        return task
72
72
 
73
 
    def test_clear(self):
74
 
        # <https://bugs.launchpad.net/bzr/+bug/611127> clear must actually
75
 
        # send spaces to clear the line
76
 
        out, view = self.make_view()
77
 
        task = self.make_task(None, view, 'reticulating splines', 5, 20)
78
 
        view.show_progress(task)
79
 
        self.assertEqual(
80
 
'\r/ reticulating splines 5/20                                                    \r'
81
 
            , out.getvalue())
82
 
        view.clear()
83
 
        self.assertEqual(
84
 
'\r/ reticulating splines 5/20                                                    \r'
85
 
            + '\r' + 79 * ' ' + '\r',
86
 
            out.getvalue())
87
 
 
88
73
    def test_render_progress_no_bar(self):
89
74
        """The default view now has a spinner but no bar."""
90
75
        out, view = self.make_view()
115
100
        # so we're in the first half of the main task, and half way through
116
101
        # that
117
102
        self.assertEqual(
118
 
'[####-               ] reticulating splines:stage2 1/2                         '
 
103
r'[####-               ] reticulating splines:stage2 1/2'
119
104
            , view._render_line())
120
105
        # if the nested task is complete, then we're all the way through the
121
106
        # first half of the overall work
122
107
        task2.update('stage2', 2, 2)
123
108
        self.assertEqual(
124
 
'[#########\          ] reticulating splines:stage2 2/2                         '
 
109
r'[#########\          ] reticulating splines:stage2 2/2'
125
110
            , view._render_line())
126
111
 
127
112
    def test_render_progress_sub_nested(self):
138
123
        # progress indication, just a label; and the bottom one is half done,
139
124
        # so the overall fraction is 1/4
140
125
        self.assertEqual(
141
 
'[####|               ] a:b:c 1/2                                               '
 
126
            r'[####|               ] a:b:c 1/2'
142
127
            , view._render_line())
143
 
 
144
 
    def test_render_truncated(self):
145
 
        # when the bar is too long for the terminal, we prefer not to truncate
146
 
        # the counters because they might be interesting, and because
147
 
        # truncating the numbers might be misleading
148
 
        out, view = self.make_view()
149
 
        task_a = ProgressTask(None, progress_view=view)
150
 
        task_a.update('start_' + 'a' * 200 + '_end', 2000, 5000)
151
 
        line = view._render_line()
152
 
        self.assertEqual(
153
 
'- start_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.. 2000/5000',
154
 
           line) 
155
 
        self.assertEqual(len(line), 79)
156
 
 
157
 
 
158
 
    def test_render_with_activity(self):
159
 
        # if the progress view has activity, it's shown before the spinner
160
 
        out, view = self.make_view()
161
 
        task_a = ProgressTask(None, progress_view=view)
162
 
        view._last_transport_msg = '   123kB   100kB/s '
163
 
        line = view._render_line()
164
 
        self.assertEqual(
165
 
'   123kB   100kB/s /                                                           ',
166
 
           line) 
167
 
        self.assertEqual(len(line), 79)
168
 
 
169
 
        task_a.update('start_' + 'a' * 200 + '_end', 2000, 5000)
170
 
        view._last_transport_msg = '   123kB   100kB/s '
171
 
        line = view._render_line()
172
 
        self.assertEqual(
173
 
'   123kB   100kB/s \\ start_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.. 2000/5000',
174
 
           line) 
175
 
        self.assertEqual(len(line), 79)