← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/__init__.py

  • Committer: Martin Pool
  • Date: 2007-07-04 08:46:22 UTC
  • mfrom: (2552.2.5 run_bzr)
  • mto: This revision was merged to the branch mainline in revision 2588.
  • Revision ID: mbp@sourcefrog.net-20070704084622-6b8enfv9o71s7ung
Merge more runbzr cleanups

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/__init__.py
1350
1350
            if isinstance(args[0], (list, basestring)):
1351
1351
                args = args[0]
1352
1352
        else:
1353
 
            ## symbol_versioning.warn(zero_eighteen % "passing varargs to run_bzr",
1354
 
            ##         DeprecationWarning, stacklevel=2)
1355
 
            # not done yet, because too many tests would need to  be updated -
1356
 
            # but please don't do this in new code.  -- mbp 20070626
1357
 
            pass
 
1353
            symbol_versioning.warn(zero_eighteen % "passing varargs to run_bzr",
 
1354
                                   DeprecationWarning, stacklevel=3)
1358
1355
 
1359
1356
        out, err = self._run_bzr_autosplit(args=args,
1360
1357
            retcode=retcode,
1382
1379
        :param kwargs: Keyword arguments which are interpreted by run_bzr
1383
1380
            This function changes the default value of retcode to be 3,
1384
1381
            since in most cases this is run when you expect bzr to fail.
 
1382
 
1385
1383
        :return: (out, err) The actual output of running the command (in case
1386
1384
            you want to do more inspection)
1387
1385
 
1397
1395
                               'commit', '--strict', '-m', 'my commit comment')
1398
1396
        """
1399
1397
        kwargs.setdefault('retcode', 3)
1400
 
        out, err = self.run_bzr(error_regexes=error_regexes, *args, **kwargs)
 
1398
        kwargs['error_regexes'] = error_regexes
 
1399
        out, err = self.run_bzr(*args, **kwargs)
1401
1400
        return out, err
1402
1401
 
1403
1402
    def run_bzr_subprocess(self, *args, **kwargs):