← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/__init__.py

- fix _find_remote_branch to avoid strange error for nonexistent branch

  It used to keep recursing up until the url was invalid, giving an
  IDNA error.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/__init__.py
74
74
        
75
75
        self._log_file_name = name
76
76
 
77
 
    def run(self, result):
78
 
        self.apply_redirected(None, None, None,
79
 
                              unittest.TestCase.run, self, result)
80
77
        
81
78
    def tearDown(self):
82
79
        logging.getLogger('').removeHandler(self._log_hdlr)
141
138
        if stdin is None:
142
139
            stdin = StringIO("")
143
140
        if stdout is None:
144
 
            if hasattr(self, "_log_file"):
145
 
                stdout = self._log_file
146
 
            else:
147
 
                stdout = StringIO()
 
141
            stdout = self._log_file
148
142
        if stderr is None:
149
 
            if hasattr(self, "_log_file"):
150
 
                stderr = self._log_file
151
 
            else:
152
 
                stderr = StringIO()
 
143
            stderr = self._log_file
153
144
        real_stdin = sys.stdin
154
145
        real_stdout = sys.stdout
155
146
        real_stderr = sys.stderr
319
310
                   'bzrlib.selftest.testfetch',
320
311
                   'bzrlib.selftest.versioning',
321
312
                   'bzrlib.selftest.whitebox',
322
 
                   'bzrlib.selftest.testmerge',
323
313
                   'bzrlib.selftest.testmerge3',
324
314
                   'bzrlib.selftest.testhashcache',
325
315
                   'bzrlib.selftest.teststatus',
331
321
                   'bzrlib.selftest.test_merge_core',
332
322
                   'bzrlib.selftest.test_smart_add',
333
323
                   'bzrlib.selftest.testdiff',
 
324
                   'bzrlib.selftest.test_xml',
334
325
                   'bzrlib.fetch',
335
326
                   'bzrlib.selftest.teststore',
336
 
                   'bzrlib.selftest.testgraph',
337
327
                   ]
338
328
 
339
329
    for m in (bzrlib.store, bzrlib.inventory, bzrlib.branch,