← 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: John Arbash Meinel
  • Date: 2009-02-23 15:29:35 UTC
  • mfrom: (3943.7.7 bzr.code_style_cleanup)
  • mto: This revision was merged to the branch mainline in revision 4033.
  • Revision ID: john@arbash-meinel.com-20090223152935-oel9m92mwcc6nb4h
Merge the removal of all trailing whitespace, and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_ui.py
158
158
        pb1.finished()
159
159
 
160
160
    def test_progress_stack(self):
161
 
        # test the progress bar stack which the default text factory 
 
161
        # test the progress bar stack which the default text factory
162
162
        # uses.
163
163
        stderr = StringIO()
164
164
        stdout = StringIO()