← 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: Andrew Bennetts
  • Date: 2010-07-29 11:17:57 UTC
  • mfrom: (5050.3.17 2.2)
  • mto: This revision was merged to the branch mainline in revision 5365.
  • Revision ID: andrew.bennetts@canonical.com-20100729111757-018h3pcefo7z0dnq
Merge lp:bzr/2.2 into lp:bzr.

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._width = 80
 
61
        view._avail_width = lambda: 79
62
62
        return out, view
63
63
    
64
64
    def make_task(self, parent_task, view, msg, curr, total):
100
100
        # so we're in the first half of the main task, and half way through
101
101
        # that
102
102
        self.assertEqual(
103
 
r'[####-               ] reticulating splines:stage2 1/2'
 
103
'[####-               ] reticulating splines:stage2 1/2                         '
104
104
            , view._render_line())
105
105
        # if the nested task is complete, then we're all the way through the
106
106
        # first half of the overall work
107
107
        task2.update('stage2', 2, 2)
108
108
        self.assertEqual(
109
 
r'[#########\          ] reticulating splines:stage2 2/2'
 
109
'[#########\          ] reticulating splines:stage2 2/2                         '
110
110
            , view._render_line())
111
111
 
112
112
    def test_render_progress_sub_nested(self):
123
123
        # progress indication, just a label; and the bottom one is half done,
124
124
        # so the overall fraction is 1/4
125
125
        self.assertEqual(
126
 
            r'[####|               ] a:b:c 1/2'
 
126
'[####|               ] a:b:c 1/2                                               '
127
127
            , view._render_line())
 
128
 
 
129
    def test_render_truncated(self):
 
130
        # when the bar is too long for the terminal, we prefer not to truncate
 
131
        # the counters because they might be interesting, and because
 
132
        # truncating the numbers might be misleading
 
133
        out, view = self.make_view()
 
134
        task_a = ProgressTask(None, progress_view=view)
 
135
        task_a.update('start_' + 'a' * 200 + '_end', 2000, 5000)
 
136
        line = view._render_line()
 
137
        self.assertEqual(
 
138
'- start_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.. 2000/5000',
 
139
           line) 
 
140
        self.assertEqual(len(line), 79)
 
141
 
 
142
 
 
143
    def test_render_with_activity(self):
 
144
        # if the progress view has activity, it's shown before the spinner
 
145
        out, view = self.make_view()
 
146
        task_a = ProgressTask(None, progress_view=view)
 
147
        view._last_transport_msg = '   123kB   100kB/s '
 
148
        line = view._render_line()
 
149
        self.assertEqual(
 
150
'   123kB   100kB/s /                                                           ',
 
151
           line) 
 
152
        self.assertEqual(len(line), 79)
 
153
 
 
154
        task_a.update('start_' + 'a' * 200 + '_end', 2000, 5000)
 
155
        view._last_transport_msg = '   123kB   100kB/s '
 
156
        line = view._render_line()
 
157
        self.assertEqual(
 
158
'   123kB   100kB/s \\ start_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.. 2000/5000',
 
159
           line) 
 
160
        self.assertEqual(len(line), 79)