bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
| 
2599.1.1
by Martin Pool
 Don't show dots progress indicatiors in noninteractive mode  | 
1  | 
# Copyright (C) 2006, 2007 Canonical Ltd
 | 
| 
1551.2.27
by Aaron Bentley
 Got propogation under test  | 
2  | 
#
 | 
3  | 
# This program is free software; you can redistribute it and/or modify
 | 
|
4  | 
# it under the terms of the GNU General Public License as published by
 | 
|
5  | 
# the Free Software Foundation; either version 2 of the License, or
 | 
|
6  | 
# (at your option) any later version.
 | 
|
7  | 
#
 | 
|
8  | 
# This program is distributed in the hope that it will be useful,
 | 
|
9  | 
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
|
10  | 
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
|
11  | 
# GNU General Public License for more details.
 | 
|
12  | 
#
 | 
|
13  | 
# You should have received a copy of the GNU General Public License
 | 
|
14  | 
# along with this program; if not, write to the Free Software
 | 
|
15  | 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 | 
|
16  | 
||
| 
1843.3.5
by John Arbash Meinel
 Add tests to assert we fall back to DotsProgressBar when appropriate.  | 
17  | 
import os  | 
| 
1551.2.28
by Aaron Bentley
 Ensure all ProgressBar implementations can be used as parents  | 
18  | 
from StringIO import StringIO  | 
19  | 
||
| 
1843.3.7
by John Arbash Meinel
 new env var 'BZR_PROGRESS_BAR' to select the exact progress type  | 
20  | 
from bzrlib import errors  | 
| 
1773.4.1
by Martin Pool
 Add pyflakes makefile target; fix many warnings  | 
21  | 
from bzrlib.progress import (  | 
| 
2599.1.1
by Martin Pool
 Don't show dots progress indicatiors in noninteractive mode  | 
22  | 
DummyProgress,  | 
23  | 
ChildProgress,  | 
|
| 
1773.4.1
by Martin Pool
 Add pyflakes makefile target; fix many warnings  | 
24  | 
TTYProgressBar,  | 
25  | 
DotsProgressBar,  | 
|
26  | 
ProgressBarStack,  | 
|
| 
3146.6.1
by Aaron Bentley
 InterDifferingSerializer shows a progress bar  | 
27  | 
InstrumentedProgress,  | 
| 
1773.4.1
by Martin Pool
 Add pyflakes makefile target; fix many warnings  | 
28  | 
        )
 | 
| 
1551.2.27
by Aaron Bentley
 Got propogation under test  | 
29  | 
from bzrlib.tests import TestCase  | 
30  | 
||
| 
1843.3.7
by John Arbash Meinel
 new env var 'BZR_PROGRESS_BAR' to select the exact progress type  | 
31  | 
|
| 
1551.2.29
by Aaron Bentley
 Got stack handling under test  | 
32  | 
class FakeStack:  | 
| 
3006.3.1
by Robert Collins
 Minor PEP8 changes.  | 
33  | 
|
| 
1551.2.29
by Aaron Bentley
 Got stack handling under test  | 
34  | 
def __init__(self, top):  | 
35  | 
self.__top = top  | 
|
36  | 
||
37  | 
def top(self):  | 
|
38  | 
return self.__top  | 
|
39  | 
||
| 
3006.3.1
by Robert Collins
 Minor PEP8 changes.  | 
40  | 
|
| 
1843.3.6
by John Arbash Meinel
 Cleanup tests by using a helper  | 
41  | 
class _TTYStringIO(StringIO):  | 
42  | 
"""A helper class which makes a StringIO look like a terminal"""  | 
|
43  | 
||
44  | 
def isatty(self):  | 
|
45  | 
return True  | 
|
46  | 
||
47  | 
||
48  | 
class _NonTTYStringIO(StringIO):  | 
|
49  | 
"""Helper that implements isatty() but returns False"""  | 
|
50  | 
||
51  | 
def isatty(self):  | 
|
52  | 
return False  | 
|
53  | 
||
54  | 
||
| 
1551.2.27
by Aaron Bentley
 Got propogation under test  | 
55  | 
class TestProgress(TestCase):  | 
| 
3006.3.1
by Robert Collins
 Minor PEP8 changes.  | 
56  | 
|
| 
1551.2.27
by Aaron Bentley
 Got propogation under test  | 
57  | 
def setUp(self):  | 
| 
1551.2.29
by Aaron Bentley
 Got stack handling under test  | 
58  | 
q = DummyProgress()  | 
59  | 
self.top = ChildProgress(_stack=FakeStack(q))  | 
|
| 
1551.2.27
by Aaron Bentley
 Got propogation under test  | 
60  | 
|
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)  | 
|
| 
1551.2.29
by Aaron Bentley
 Got stack handling under test  | 
67  | 
child = ChildProgress(_stack=FakeStack(self.top))  | 
| 
1551.2.27
by Aaron Bentley
 Got propogation under test  | 
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)  | 
|
| 
1551.2.29
by Aaron Bentley
 Got stack handling under test  | 
73  | 
grandchild = ChildProgress(_stack=FakeStack(child))  | 
| 
1551.2.27
by Aaron Bentley
 Got propogation under test  | 
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)  | 
|
86  | 
        #test clamping
 | 
|
87  | 
grandchild.update('barbells', 2, 2)  | 
|
88  | 
self.assertEqual(self.top.child_fraction, 1)  | 
|
| 
1551.2.28
by Aaron Bentley
 Ensure all ProgressBar implementations can be used as parents  | 
89  | 
|
90  | 
def test_implementations(self):  | 
|
91  | 
for implementation in (TTYProgressBar, DotsProgressBar,  | 
|
92  | 
DummyProgress):  | 
|
93  | 
self.check_parent_handling(implementation)  | 
|
94  | 
||
95  | 
def check_parent_handling(self, parentclass):  | 
|
96  | 
top = parentclass(to_file=StringIO())  | 
|
97  | 
top.update('foobles', 1, 2)  | 
|
| 
1551.2.29
by Aaron Bentley
 Got stack handling under test  | 
98  | 
child = ChildProgress(_stack=FakeStack(top))  | 
| 
1551.2.28
by Aaron Bentley
 Ensure all ProgressBar implementations can be used as parents  | 
99  | 
child.update('baubles', 4, 4)  | 
100  | 
top.update('lala', 2, 2)  | 
|
101  | 
child.update('baubles', 4, 4)  | 
|
| 
1551.2.29
by Aaron Bentley
 Got stack handling under test  | 
102  | 
|
103  | 
def test_stacking(self):  | 
|
104  | 
self.check_stack(TTYProgressBar, ChildProgress)  | 
|
105  | 
self.check_stack(DotsProgressBar, ChildProgress)  | 
|
106  | 
self.check_stack(DummyProgress, DummyProgress)  | 
|
107  | 
||
108  | 
def check_stack(self, parent_class, child_class):  | 
|
109  | 
stack = ProgressBarStack(klass=parent_class, to_file=StringIO())  | 
|
110  | 
parent = stack.get_nested()  | 
|
111  | 
try:  | 
|
112  | 
self.assertIs(parent.__class__, parent_class)  | 
|
113  | 
child = stack.get_nested()  | 
|
114  | 
try:  | 
|
115  | 
self.assertIs(child.__class__, child_class)  | 
|
116  | 
finally:  | 
|
117  | 
child.finished()  | 
|
118  | 
finally:  | 
|
119  | 
parent.finished()  | 
|
| 
1793.1.1
by Aaron Bentley
 Hide TTYProgressBars unless they last more than 1 second  | 
120  | 
|
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)!
 | 
|
128  | 
pb.start_time -= 1  | 
|
129  | 
        # Updates after a second should not be squelched
 | 
|
130  | 
pb.update('me', 1, 1)  | 
|
131  | 
self.assertFalse(pb.always_throttled)  | 
|
| 
1843.3.1
by John Arbash Meinel
 Don't clear anything if nothing has been written.  | 
132  | 
|
133  | 
def test_clear(self):  | 
|
134  | 
sio = StringIO()  | 
|
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
 | 
|
138  | 
pb.clear()  | 
|
139  | 
        # These two should not be displayed because
 | 
|
140  | 
        # of throttling
 | 
|
141  | 
pb.update('foo', 1, 3)  | 
|
142  | 
pb.update('bar', 2, 3)  | 
|
143  | 
        # So pb.clear() has nothing to do
 | 
|
144  | 
pb.clear()  | 
|
145  | 
||
146  | 
        # Make sure the next update isn't throttled
 | 
|
147  | 
pb.start_time -= 1  | 
|
148  | 
pb.update('baz', 3, 3)  | 
|
149  | 
pb.clear()  | 
|
150  | 
||
151  | 
self.assertEqual('\r[=========] baz 3/3'  | 
|
152  | 
'\r \r',  | 
|
153  | 
sio.getvalue())  | 
|
| 
1843.3.3
by John Arbash Meinel
 Don't let the last_updates list grow without bound.  | 
154  | 
|
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
 | 
|
159  | 
        # cleaned out
 | 
|
160  | 
pb = InstrumentedProgress(to_file=StringIO(), show_eta=False)  | 
|
161  | 
        # Just make sure this first few are throttled
 | 
|
162  | 
pb.start_time += 5  | 
|
163  | 
||
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))  | 
|
168  | 
||
169  | 
        # Unthrottle by time
 | 
|
170  | 
pb.start_time -= 10  | 
|
171  | 
||
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))  | 
|
176  | 
||
177  | 
pb.MIN_PAUSE = 0.0  | 
|
178  | 
||
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)  | 
|
183  | 
||
184  | 
self.assertEqual(pb._max_last_updates, len(pb.last_updates))  | 
|
| 
1843.3.5
by John Arbash Meinel
 Add tests to assert we fall back to DotsProgressBar when appropriate.  | 
185  | 
|
| 
1843.3.6
by John Arbash Meinel
 Cleanup tests by using a helper  | 
186  | 
|
187  | 
class TestProgressTypes(TestCase):  | 
|
188  | 
"""Test that the right ProgressBar gets instantiated at the right time."""  | 
|
189  | 
||
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']  | 
|
199  | 
||
200  | 
def reset():  | 
|
201  | 
if orig_term is None:  | 
|
202  | 
del os.environ['TERM']  | 
|
203  | 
else:  | 
|
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']  | 
|
210  | 
else:  | 
|
211  | 
os.environ['BZR_PROGRESS_BAR'] = orig_progress  | 
|
212  | 
||
213  | 
self.addCleanup(reset)  | 
|
214  | 
||
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  | 
|
219  | 
return pb  | 
|
220  | 
||
| 
1843.3.5
by John Arbash Meinel
 Add tests to assert we fall back to DotsProgressBar when appropriate.  | 
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
 | 
|
| 
1843.3.6
by John Arbash Meinel
 Cleanup tests by using a helper  | 
224  | 
out = _TTYStringIO()  | 
225  | 
pb = self.get_nested(out, 'xterm')  | 
|
226  | 
self.assertIsInstance(pb, TTYProgressBar)  | 
|
| 
1843.3.5
by John Arbash Meinel
 Add tests to assert we fall back to DotsProgressBar when appropriate.  | 
227  | 
try:  | 
| 
1843.3.6
by John Arbash Meinel
 Cleanup tests by using a helper  | 
228  | 
pb.update('foo', 1, 2)  | 
229  | 
pb.update('bar', 2, 2)  | 
|
| 
1843.3.5
by John Arbash Meinel
 Add tests to assert we fall back to DotsProgressBar when appropriate.  | 
230  | 
finally:  | 
| 
1843.3.6
by John Arbash Meinel
 Cleanup tests by using a helper  | 
231  | 
pb.finished()  | 
| 
1843.3.5
by John Arbash Meinel
 Add tests to assert we fall back to DotsProgressBar when appropriate.  | 
232  | 
|
233  | 
self.assertEqual('\r/ [==== ] foo 1/2'  | 
|
234  | 
'\r- [=======] bar 2/2'  | 
|
235  | 
'\r \r',  | 
|
236  | 
out.getvalue())  | 
|
237  | 
||
| 
2599.1.1
by Martin Pool
 Don't show dots progress indicatiors in noninteractive mode  | 
238  | 
def test_noninteractive_progress(self):  | 
239  | 
out = _NonTTYStringIO()  | 
|
240  | 
pb = self.get_nested(out, 'xterm')  | 
|
241  | 
self.assertIsInstance(pb, DummyProgress)  | 
|
242  | 
try:  | 
|
243  | 
pb.update('foo', 1, 2)  | 
|
244  | 
pb.update('bar', 2, 2)  | 
|
245  | 
finally:  | 
|
246  | 
pb.finished()  | 
|
247  | 
self.assertEqual('', out.getvalue())  | 
|
248  | 
||
| 
1843.3.5
by John Arbash Meinel
 Add tests to assert we fall back to DotsProgressBar when appropriate.  | 
249  | 
def test_dots_progress(self):  | 
| 
2599.1.1
by Martin Pool
 Don't show dots progress indicatiors in noninteractive mode  | 
250  | 
        # make sure we get the right progress bar when not on a terminal
 | 
| 
1843.3.6
by John Arbash Meinel
 Cleanup tests by using a helper  | 
251  | 
out = _NonTTYStringIO()  | 
| 
2599.1.1
by Martin Pool
 Don't show dots progress indicatiors in noninteractive mode  | 
252  | 
pb = self.get_nested(out, 'xterm', 'dots')  | 
| 
1843.3.6
by John Arbash Meinel
 Cleanup tests by using a helper  | 
253  | 
self.assertIsInstance(pb, DotsProgressBar)  | 
| 
1843.3.5
by John Arbash Meinel
 Add tests to assert we fall back to DotsProgressBar when appropriate.  | 
254  | 
try:  | 
| 
1843.3.6
by John Arbash Meinel
 Cleanup tests by using a helper  | 
255  | 
pb.update('foo', 1, 2)  | 
256  | 
pb.update('bar', 2, 2)  | 
|
| 
1843.3.5
by John Arbash Meinel
 Add tests to assert we fall back to DotsProgressBar when appropriate.  | 
257  | 
finally:  | 
| 
1843.3.6
by John Arbash Meinel
 Cleanup tests by using a helper  | 
258  | 
pb.finished()  | 
| 
1843.3.5
by John Arbash Meinel
 Add tests to assert we fall back to DotsProgressBar when appropriate.  | 
259  | 
self.assertEqual('foo: .'  | 
260  | 
'\nbar: .'  | 
|
261  | 
'\n',  | 
|
262  | 
out.getvalue())  | 
|
263  | 
||
| 
1843.3.6
by John Arbash Meinel
 Cleanup tests by using a helper  | 
264  | 
def test_no_isatty_progress(self):  | 
265  | 
        # Make sure ProgressBarStack handles a plain StringIO()
 | 
|
266  | 
import cStringIO  | 
|
267  | 
out = cStringIO.StringIO()  | 
|
268  | 
pb = self.get_nested(out, 'xterm')  | 
|
269  | 
pb.finished()  | 
|
| 
2599.1.1
by Martin Pool
 Don't show dots progress indicatiors in noninteractive mode  | 
270  | 
self.assertIsInstance(pb, DummyProgress)  | 
| 
1843.3.6
by John Arbash Meinel
 Cleanup tests by using a helper  | 
271  | 
|
| 
1843.3.5
by John Arbash Meinel
 Add tests to assert we fall back to DotsProgressBar when appropriate.  | 
272  | 
def test_dumb_progress(self):  | 
| 
2599.1.1
by Martin Pool
 Don't show dots progress indicatiors in noninteractive mode  | 
273  | 
        # using a terminal that can't do cursor movement
 | 
| 
1843.3.6
by John Arbash Meinel
 Cleanup tests by using a helper  | 
274  | 
out = _TTYStringIO()  | 
275  | 
pb = self.get_nested(out, 'dumb')  | 
|
276  | 
pb.finished()  | 
|
| 
2599.1.1
by Martin Pool
 Don't show dots progress indicatiors in noninteractive mode  | 
277  | 
self.assertIsInstance(pb, DummyProgress)  | 
| 
1843.3.7
by John Arbash Meinel
 new env var 'BZR_PROGRESS_BAR' to select the exact progress type  | 
278  | 
|
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
 | 
|
282  | 
import cStringIO  | 
|
283  | 
||
284  | 
        # Usually, this would be a DotsProgressBar
 | 
|
285  | 
out = cStringIO.StringIO()  | 
|
286  | 
pb = self.get_nested(out, 'dumb', 'tty')  | 
|
287  | 
pb.finished()  | 
|
288  | 
        # Even though we are not a tty, the env_var will override
 | 
|
289  | 
self.assertIsInstance(pb, TTYProgressBar)  | 
|
290  | 
||
291  | 
def test_progress_env_none(self):  | 
|
292  | 
        # Even though we are in a valid tty, no progress
 | 
|
293  | 
out = _TTYStringIO()  | 
|
294  | 
pb = self.get_nested(out, 'xterm', 'none')  | 
|
295  | 
pb.finished()  | 
|
296  | 
self.assertIsInstance(pb, DummyProgress)  | 
|
297  | 
||
298  | 
def test_progress_env_invalid(self):  | 
|
299  | 
out = _TTYStringIO()  | 
|
300  | 
self.assertRaises(errors.InvalidProgressBarType, self.get_nested,  | 
|
301  | 
out, 'xterm', 'nonexistant')  |