55
class TestProgress(TestCase):
59
self.top = ChildProgress(_stack=FakeStack(q))
61
def test_propogation(self):
62
self.top.update('foobles', 1, 2)
63
self.assertEqual(self.top.message, 'foobles')
64
self.assertEqual(self.top.current, 1)
65
self.assertEqual(self.top.total, 2)
66
self.assertEqual(self.top.child_fraction, 0)
67
child = ChildProgress(_stack=FakeStack(self.top))
68
child.update('baubles', 2, 4)
69
self.assertEqual(self.top.message, 'foobles')
70
self.assertEqual(self.top.current, 1)
71
self.assertEqual(self.top.total, 2)
72
self.assertEqual(self.top.child_fraction, 0.5)
73
grandchild = ChildProgress(_stack=FakeStack(child))
74
grandchild.update('barbells', 1, 2)
75
self.assertEqual(self.top.child_fraction, 0.625)
76
self.assertEqual(child.child_fraction, 0.5)
77
child.update('baubles', 3, 4)
78
self.assertEqual(child.child_fraction, 0)
79
self.assertEqual(self.top.child_fraction, 0.75)
80
grandchild.update('barbells', 1, 2)
81
self.assertEqual(self.top.child_fraction, 0.875)
82
grandchild.update('barbells', 2, 2)
83
self.assertEqual(self.top.child_fraction, 1)
84
child.update('baubles', 4, 4)
85
self.assertEqual(self.top.child_fraction, 1)
87
grandchild.update('barbells', 2, 2)
88
self.assertEqual(self.top.child_fraction, 1)
90
def test_implementations(self):
91
for implementation in (TTYProgressBar, DotsProgressBar,
93
self.check_parent_handling(implementation)
95
def check_parent_handling(self, parentclass):
96
top = parentclass(to_file=StringIO())
97
top.update('foobles', 1, 2)
98
child = ChildProgress(_stack=FakeStack(top))
99
child.update('baubles', 4, 4)
100
top.update('lala', 2, 2)
101
child.update('baubles', 4, 4)
103
def test_stacking(self):
104
self.check_stack(TTYProgressBar, ChildProgress)
105
self.check_stack(DotsProgressBar, ChildProgress)
106
self.check_stack(DummyProgress, DummyProgress)
108
def check_stack(self, parent_class, child_class):
109
stack = ProgressBarStack(klass=parent_class, to_file=StringIO())
110
parent = stack.get_nested()
112
self.assertIs(parent.__class__, parent_class)
113
child = stack.get_nested()
115
self.assertIs(child.__class__, child_class)
121
def test_throttling(self):
122
pb = InstrumentedProgress(to_file=StringIO())
123
# instantaneous updates should be squelched
124
pb.update('me', 1, 1)
125
self.assertTrue(pb.always_throttled)
126
pb = InstrumentedProgress(to_file=StringIO())
127
# It's like an instant sleep(1)!
129
# Updates after a second should not be squelched
130
pb.update('me', 1, 1)
131
self.assertFalse(pb.always_throttled)
133
def test_clear(self):
135
pb = TTYProgressBar(to_file=sio, show_eta=False)
136
pb.width = 20 # Just make it easier to test
137
# This should not output anything
139
# These two should not be displayed because
141
pb.update('foo', 1, 3)
142
pb.update('bar', 2, 3)
143
# So pb.clear() has nothing to do
146
# Make sure the next update isn't throttled
148
pb.update('baz', 3, 3)
151
self.assertEqual('\r[=========] baz 3/3'
155
def test_no_eta(self):
156
# An old version of the progress bar would
157
# store every update if show_eta was false
158
# because the eta routine was where it was
160
pb = InstrumentedProgress(to_file=StringIO(), show_eta=False)
161
# Just make sure this first few are throttled
164
# These messages are throttled, and don't contribute
165
for count in xrange(100):
166
pb.update('x', count, 300)
167
self.assertEqual(0, len(pb.last_updates))
172
# These happen too fast, so only one gets through
173
for count in xrange(100):
174
pb.update('x', count+100, 200)
175
self.assertEqual(1, len(pb.last_updates))
179
# But all of these go through, don't let the
180
# last_update list grow without bound
181
for count in xrange(100):
182
pb.update('x', count+100, 200)
184
self.assertEqual(pb._max_last_updates, len(pb.last_updates))
187
class TestProgressTypes(TestCase):
188
"""Test that the right ProgressBar gets instantiated at the right time."""
190
def get_nested(self, outf, term, env_progress=None):
191
"""Setup so that ProgressBar thinks we are in the supplied terminal."""
192
orig_term = os.environ.get('TERM')
193
orig_progress = os.environ.get('BZR_PROGRESS_BAR')
194
os.environ['TERM'] = term
195
if env_progress is not None:
196
os.environ['BZR_PROGRESS_BAR'] = env_progress
197
elif orig_progress is not None:
198
del os.environ['BZR_PROGRESS_BAR']
201
if orig_term is None:
202
del os.environ['TERM']
204
os.environ['TERM'] = orig_term
205
# We may have never created BZR_PROGRESS_BAR
206
# So we can't just delete like we can 'TERM' (which is always set)
207
if orig_progress is None:
208
if 'BZR_PROGRESS_BAR' in os.environ:
209
del os.environ['BZR_PROGRESS_BAR']
211
os.environ['BZR_PROGRESS_BAR'] = orig_progress
213
self.addCleanup(reset)
215
stack = ProgressBarStack(to_file=outf)
216
pb = stack.get_nested()
217
pb.start_time -= 1 # Make sure it is ready to write
218
pb.width = 20 # And it is of reasonable size
221
def test_tty_progress(self):
222
# Make sure the ProgressBarStack thinks it is
223
# writing out to a terminal, and thus uses a TTYProgressBar
225
pb = self.get_nested(out, 'xterm')
226
self.assertIsInstance(pb, TTYProgressBar)
228
pb.update('foo', 1, 2)
229
pb.update('bar', 2, 2)
233
self.assertEqual('\r/ [==== ] foo 1/2'
234
'\r- [=======] bar 2/2'
238
def test_noninteractive_progress(self):
239
out = _NonTTYStringIO()
240
pb = self.get_nested(out, 'xterm')
241
self.assertIsInstance(pb, DummyProgress)
243
pb.update('foo', 1, 2)
244
pb.update('bar', 2, 2)
247
self.assertEqual('', out.getvalue())
249
def test_dots_progress(self):
250
# make sure we get the right progress bar when not on a terminal
251
out = _NonTTYStringIO()
252
pb = self.get_nested(out, 'xterm', 'dots')
253
self.assertIsInstance(pb, DotsProgressBar)
255
pb.update('foo', 1, 2)
256
pb.update('bar', 2, 2)
259
self.assertEqual('foo: .'
264
def test_no_isatty_progress(self):
265
# Make sure ProgressBarStack handles a plain StringIO()
267
out = cStringIO.StringIO()
268
pb = self.get_nested(out, 'xterm')
270
self.assertIsInstance(pb, DummyProgress)
272
def test_dumb_progress(self):
273
# using a terminal that can't do cursor movement
275
pb = self.get_nested(out, 'dumb')
277
self.assertIsInstance(pb, DummyProgress)
279
def test_progress_env_tty(self):
280
# The environ variable BZR_PROGRESS_BAR controls what type of
281
# progress bar we will get, even if it wouldn't usually be that type
284
# Usually, this would be a DotsProgressBar
285
out = cStringIO.StringIO()
286
pb = self.get_nested(out, 'dumb', 'tty')
288
# Even though we are not a tty, the env_var will override
289
self.assertIsInstance(pb, TTYProgressBar)
291
def test_progress_env_none(self):
292
# Even though we are in a valid tty, no progress
294
pb = self.get_nested(out, 'xterm', 'none')
296
self.assertIsInstance(pb, DummyProgress)
298
def test_progress_env_invalid(self):
300
self.assertRaises(errors.InvalidProgressBarType, self.get_nested,
301
out, 'xterm', 'nonexistant')
48
class TestTextProgressView(TestCase):
49
"""Tests for text display of progress bars.
51
These try to exercise the progressview independently of its construction,
52
which is arranged by the TextUIFactory.
54
# The ProgressTask now connects directly to the ProgressView, so we can
55
# check them independently of the factory or of the determination of what
60
view = TextProgressView(out)
64
def make_task(self, parent_task, view, msg, curr, total):
65
# would normally be done by UIFactory; is done here so that we don't
67
task = ProgressTask(parent_task, progress_view=view)
69
task.current_cnt = curr
70
task.total_cnt = total
73
def test_render_progress_easy(self):
74
"""Just one task and one quarter done"""
75
out, view = self.make_view()
76
task = self.make_task(None, view, 'reticulating splines', 5, 20)
77
view.show_progress(task)
79
'\r[####/ ] reticulating splines 5/20 \r'
82
def test_render_progress_nested(self):
83
"""Tasks proportionally contribute to overall progress"""
84
out, view = self.make_view()
85
task = self.make_task(None, view, 'reticulating splines', 0, 2)
86
task2 = self.make_task(task, view, 'stage2', 1, 2)
87
view.show_progress(task2)
88
# so we're in the first half of the main task, and half way through
91
r'[####- ] reticulating splines:stage2 1/2'
92
, view._render_line())
93
# if the nested task is complete, then we're all the way through the
94
# first half of the overall work
95
task2.update('stage2', 2, 2)
97
r'[#########\ ] reticulating splines:stage2 2/2'
98
, view._render_line())
100
def test_render_progress_sub_nested(self):
101
"""Intermediate tasks don't mess up calculation."""
102
out, view = self.make_view()
103
task_a = ProgressTask(None, progress_view=view)
104
task_a.update('a', 0, 2)
105
task_b = ProgressTask(task_a, progress_view=view)
107
task_c = ProgressTask(task_b, progress_view=view)
108
task_c.update('c', 1, 2)
109
# the top-level task is in its first half; the middle one has no
110
# progress indication, just a label; and the bottom one is half done,
111
# so the overall fraction is 1/4
113
r'[####| ] a:b:c 1/2'
114
, view._render_line())
added
removed
bzrlib/tests/test_progress.py
