← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_ui.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-04-06 11:58:19 UTC
  • mfrom: (1558.8.5 bzr.progress)
  • Revision ID: pqm@pqm.ubuntu.com-20060406115819-479ae52584747faa
Pass note up the stack instead of using bzrlib.ui_factory

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_ui.py
25
25
import bzrlib.errors as errors
26
26
from bzrlib.progress import TTYProgressBar, ProgressBarStack
27
27
from bzrlib.tests import TestCase
28
 
import bzrlib.ui
29
28
from bzrlib.ui import SilentUIFactory
30
29
from bzrlib.ui.text import TextUIFactory
31
30
 
63
62
    def test_progress_note(self):
64
63
        stderr = StringIO()
65
64
        stdout = StringIO()
66
 
        old_factory = bzrlib.ui.ui_factory
67
 
        bzrlib.ui.ui_factory = TextUIFactory()
68
 
        pb = None
 
65
        ui_factory = TextUIFactory()
 
66
        pb = ui_factory.nested_progress_bar()
69
67
        try:
70
 
            pb = bzrlib.ui.ui_factory.nested_progress_bar()
71
68
            pb.to_messages_file = stdout
72
 
            bzrlib.ui.ui_factory._progress_bar_stack.bottom().to_file = stderr
 
69
            ui_factory._progress_bar_stack.bottom().to_file = stderr
73
70
            result = pb.note('t')
74
71
            self.assertEqual(None, result)
75
72
            self.assertEqual("t\n", stdout.getvalue())
78
75
            # least a 10-character wide terminal :)
79
76
            self.assertContainsRe(stderr.getvalue(), r'^\r {10,}\r$')
80
77
        finally:
81
 
            if pb is not None:
82
 
                pb.finished()
83
 
            bzrlib.ui.ui_factory = old_factory
 
78
            pb.finished()
84
79
 
85
80
    def test_progress_nested(self):
86
81
        # test factory based nested and popping.