/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/__init__.py

Merge Martins 0.15rc2 release branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/__init__.py
68
68
                     'bzrlib.tests.blackbox.test_logformats',
69
69
                     'bzrlib.tests.blackbox.test_ls',
70
70
                     'bzrlib.tests.blackbox.test_merge',
 
71
                     'bzrlib.tests.blackbox.test_merge_directive',
71
72
                     'bzrlib.tests.blackbox.test_missing',
72
73
                     'bzrlib.tests.blackbox.test_mv',
73
74
                     'bzrlib.tests.blackbox.test_nick',
95
96
                     'bzrlib.tests.blackbox.test_uncommit',
96
97
                     'bzrlib.tests.blackbox.test_update',
97
98
                     'bzrlib.tests.blackbox.test_upgrade',
 
99
                     'bzrlib.tests.blackbox.test_version',
98
100
                     'bzrlib.tests.blackbox.test_version_info',
99
101
                     'bzrlib.tests.blackbox.test_versioning',
100
102
                     'bzrlib.tests.blackbox.test_whoami',
121
123
            return self.run_bzr_captured(args, retcode=retcode)[0]
122
124
        else:
123
125
            return self.run_bzr_captured(args, retcode=retcode)
124
 
 
125
 
 
126
 
class TestUIFactory(ui.CLIUIFactory):
127
 
    """A UI Factory for testing - hide the progress bar but emit note()s."""
128
 
 
129
 
    def __init__(self,
130
 
                 stdout=None,
131
 
                 stderr=None):
132
 
        super(TestUIFactory, self).__init__()
133
 
        if stdout is None:
134
 
            self.stdout = sys.stdout
135
 
        else:
136
 
            self.stdout = stdout
137
 
        if stderr is None:
138
 
            self.stderr = sys.stderr
139
 
        else:
140
 
            self.stderr = stderr
141
 
 
142
 
    def clear(self):
143
 
        """See progress.ProgressBar.clear()."""
144
 
 
145
 
    def clear_term(self):
146
 
        """See progress.ProgressBar.clear_term()."""
147
 
 
148
 
    def clear_term(self):
149
 
        """See progress.ProgressBar.clear_term()."""
150
 
 
151
 
    def finished(self):
152
 
        """See progress.ProgressBar.finished()."""
153
 
 
154
 
    def note(self, fmt_string, *args, **kwargs):
155
 
        """See progress.ProgressBar.note()."""
156
 
        self.stdout.write((fmt_string + "\n") % args)
157
 
 
158
 
    def progress_bar(self):
159
 
        return self
160
 
    
161
 
    def nested_progress_bar(self):
162
 
        return self
163
 
 
164
 
    def update(self, message, count=None, total=None):
165
 
        """See progress.ProgressBar.update()."""