64
class TestProgress(TestCase):
67
self.top = ChildProgress(_stack=FakeStack(q))
69
def test_propogation(self):
70
self.top.update('foobles', 1, 2)
71
self.assertEqual(self.top.message, 'foobles')
72
self.assertEqual(self.top.current, 1)
73
self.assertEqual(self.top.total, 2)
74
self.assertEqual(self.top.child_fraction, 0)
75
child = ChildProgress(_stack=FakeStack(self.top))
76
child.update('baubles', 2, 4)
77
self.assertEqual(self.top.message, 'foobles')
78
self.assertEqual(self.top.current, 1)
79
self.assertEqual(self.top.total, 2)
80
self.assertEqual(self.top.child_fraction, 0.5)
81
grandchild = ChildProgress(_stack=FakeStack(child))
82
grandchild.update('barbells', 1, 2)
83
self.assertEqual(self.top.child_fraction, 0.625)
84
self.assertEqual(child.child_fraction, 0.5)
85
child.update('baubles', 3, 4)
86
self.assertEqual(child.child_fraction, 0)
87
self.assertEqual(self.top.child_fraction, 0.75)
88
grandchild.update('barbells', 1, 2)
89
self.assertEqual(self.top.child_fraction, 0.875)
90
grandchild.update('barbells', 2, 2)
91
self.assertEqual(self.top.child_fraction, 1)
92
child.update('baubles', 4, 4)
93
self.assertEqual(self.top.child_fraction, 1)
95
grandchild.update('barbells', 2, 2)
96
self.assertEqual(self.top.child_fraction, 1)
98
def test_implementations(self):
99
for implementation in (TTYProgressBar, DotsProgressBar,
101
self.check_parent_handling(implementation)
103
def check_parent_handling(self, parentclass):
104
top = parentclass(to_file=StringIO())
105
top.update('foobles', 1, 2)
106
child = ChildProgress(_stack=FakeStack(top))
107
child.update('baubles', 4, 4)
108
top.update('lala', 2, 2)
109
child.update('baubles', 4, 4)
111
def test_stacking(self):
112
self.check_stack(TTYProgressBar, ChildProgress)
113
self.check_stack(DotsProgressBar, ChildProgress)
114
self.check_stack(DummyProgress, DummyProgress)
116
def check_stack(self, parent_class, child_class):
117
stack = ProgressBarStack(klass=parent_class, to_file=StringIO())
118
parent = stack.get_nested()
120
self.assertIs(parent.__class__, parent_class)
121
child = stack.get_nested()
123
self.assertIs(child.__class__, child_class)
129
def test_throttling(self):
130
pb = InstrumentedProgress(to_file=StringIO())
131
# instantaneous updates should be squelched
132
pb.update('me', 1, 1)
133
self.assertTrue(pb.always_throttled)
134
pb = InstrumentedProgress(to_file=StringIO())
135
# It's like an instant sleep(1)!
137
# Updates after a second should not be squelched
138
pb.update('me', 1, 1)
139
self.assertFalse(pb.always_throttled)
141
def test_clear(self):
143
pb = TTYProgressBar(to_file=sio, show_eta=False)
144
pb.width = 20 # Just make it easier to test
145
# This should not output anything
147
# These two should not be displayed because
149
pb.update('foo', 1, 3)
150
pb.update('bar', 2, 3)
151
# So pb.clear() has nothing to do
154
# Make sure the next update isn't throttled
156
pb.update('baz', 3, 3)
159
self.assertEqual('\r[=========] baz 3/3'
163
def test_no_eta(self):
164
# An old version of the progress bar would
165
# store every update if show_eta was false
166
# because the eta routine was where it was
168
pb = InstrumentedProgress(to_file=StringIO(), show_eta=False)
169
# Just make sure this first few are throttled
172
# These messages are throttled, and don't contribute
173
for count in xrange(100):
174
pb.update('x', count, 300)
175
self.assertEqual(0, len(pb.last_updates))
180
# These happen too fast, so only one gets through
181
for count in xrange(100):
182
pb.update('x', count+100, 200)
183
self.assertEqual(1, len(pb.last_updates))
187
# But all of these go through, don't let the
188
# last_update list grow without bound
189
for count in xrange(100):
190
pb.update('x', count+100, 200)
192
self.assertEqual(pb._max_last_updates, len(pb.last_updates))
195
class TestProgressTypes(TestCase):
196
"""Test that the right ProgressBar gets instantiated at the right time."""
198
def get_nested(self, outf, term, env_progress=None):
199
"""Setup so that ProgressBar thinks we are in the supplied terminal."""
200
orig_term = os.environ.get('TERM')
201
orig_progress = os.environ.get('BZR_PROGRESS_BAR')
202
os.environ['TERM'] = term
203
if env_progress is not None:
204
os.environ['BZR_PROGRESS_BAR'] = env_progress
205
elif orig_progress is not None:
206
del os.environ['BZR_PROGRESS_BAR']
209
if orig_term is None:
210
del os.environ['TERM']
212
os.environ['TERM'] = orig_term
213
# We may have never created BZR_PROGRESS_BAR
214
# So we can't just delete like we can 'TERM' (which is always set)
215
if orig_progress is None:
216
if 'BZR_PROGRESS_BAR' in os.environ:
217
del os.environ['BZR_PROGRESS_BAR']
219
os.environ['BZR_PROGRESS_BAR'] = orig_progress
221
self.addCleanup(reset)
223
stack = ProgressBarStack(to_file=outf)
224
pb = stack.get_nested()
225
pb.start_time -= 1 # Make sure it is ready to write
226
pb.width = 20 # And it is of reasonable size
229
def test_tty_progress(self):
230
# Make sure the ProgressBarStack thinks it is
231
# writing out to a terminal, and thus uses a TTYProgressBar
233
pb = self.get_nested(out, 'xterm')
234
self.assertIsInstance(pb, TTYProgressBar)
236
pb.update('foo', 1, 2)
237
pb.update('bar', 2, 2)
241
self.assertEqual('\r/ [==== ] foo 1/2'
242
'\r- [=======] bar 2/2'
246
def test_dots_progress(self):
247
# Make sure the ProgressBarStack thinks it is
248
# not writing out to a terminal, and thus uses a
250
out = _NonTTYStringIO()
251
pb = self.get_nested(out, 'xterm')
252
self.assertIsInstance(pb, DotsProgressBar)
254
pb.update('foo', 1, 2)
255
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, DotsProgressBar)
272
def test_dumb_progress(self):
273
# Make sure the ProgressBarStack thinks it is writing out to a
274
# terminal, but it is the emacs 'dumb' terminal, so it uses
277
pb = self.get_nested(out, 'dumb')
279
self.assertIsInstance(pb, DotsProgressBar)
281
def test_progress_env_tty(self):
282
# The environ variable BZR_PROGRESS_BAR controls what type of
283
# progress bar we will get, even if it wouldn't usually be that type
286
# Usually, this would be a DotsProgressBar
287
out = cStringIO.StringIO()
288
pb = self.get_nested(out, 'dumb', 'tty')
290
# Even though we are not a tty, the env_var will override
291
self.assertIsInstance(pb, TTYProgressBar)
293
def test_progress_env_dots(self):
294
# Even though we are in a tty, the env_var will override
296
pb = self.get_nested(out, 'xterm', 'dots')
298
self.assertIsInstance(pb, DotsProgressBar)
300
def test_progress_env_none(self):
301
# Even though we are in a valid tty, no progress
303
pb = self.get_nested(out, 'xterm', 'none')
305
self.assertIsInstance(pb, DummyProgress)
307
def test_progress_env_invalid(self):
309
self.assertRaises(errors.InvalidProgressBarType, self.get_nested,
310
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_no_bar(self):
74
"""The default view now has a spinner but no bar."""
75
out, view = self.make_view()
76
# view.enable_bar = False
77
task = self.make_task(None, view, 'reticulating splines', 5, 20)
78
view.show_progress(task)
80
'\r/ reticulating splines 5/20 \r'
83
def test_render_progress_easy(self):
84
"""Just one task and one quarter done"""
85
out, view = self.make_view()
86
view.enable_bar = True
87
task = self.make_task(None, view, 'reticulating splines', 5, 20)
88
view.show_progress(task)
90
'\r[####/ ] reticulating splines 5/20 \r'
93
def test_render_progress_nested(self):
94
"""Tasks proportionally contribute to overall progress"""
95
out, view = self.make_view()
96
task = self.make_task(None, view, 'reticulating splines', 0, 2)
97
task2 = self.make_task(task, view, 'stage2', 1, 2)
98
view.show_progress(task2)
99
view.enable_bar = True
100
# so we're in the first half of the main task, and half way through
103
r'[####- ] reticulating splines:stage2 1/2'
104
, view._render_line())
105
# if the nested task is complete, then we're all the way through the
106
# first half of the overall work
107
task2.update('stage2', 2, 2)
109
r'[#########\ ] reticulating splines:stage2 2/2'
110
, view._render_line())
112
def test_render_progress_sub_nested(self):
113
"""Intermediate tasks don't mess up calculation."""
114
out, view = self.make_view()
115
view.enable_bar = True
116
task_a = ProgressTask(None, progress_view=view)
117
task_a.update('a', 0, 2)
118
task_b = ProgressTask(task_a, progress_view=view)
120
task_c = ProgressTask(task_b, progress_view=view)
121
task_c.update('c', 1, 2)
122
# the top-level task is in its first half; the middle one has no
123
# progress indication, just a label; and the bottom one is half done,
124
# so the overall fraction is 1/4
126
r'[####| ] a:b:c 1/2'
127
, view._render_line())
added
removed
bzrlib/tests/test_progress.py
