~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/__init__.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-09-18 09:49:39 UTC
  • mfrom: (4702.1.1 integration2)
  • Revision ID: pqm@pqm.ubuntu.com-20090918094939-xmi0ihhvas4qlks9
(vila) Introduce shell-like tests feature

Show diffs side-by-side

added added

removed removed

Lines of Context:
1802
1802
        if retcode is not None:
1803
1803
            self.assertEquals(retcode, result,
1804
1804
                              message='Unexpected return code')
1805
 
        return out, err
 
1805
        return result, out, err
1806
1806
 
1807
1807
    def run_bzr(self, args, retcode=0, encoding=None, stdin=None,
1808
1808
                working_dir=None, error_regexes=[], output_encoding=None):
1837
1837
        :keyword error_regexes: A list of expected error messages.  If
1838
1838
            specified they must be seen in the error output of the command.
1839
1839
        """
1840
 
        out, err = self._run_bzr_autosplit(
 
1840
        retcode, out, err = self._run_bzr_autosplit(
1841
1841
            args=args,
1842
1842
            retcode=retcode,
1843
1843
            encoding=encoding,
3772
3772
        'bzrlib.tests.test_rio',
3773
3773
        'bzrlib.tests.test_rules',
3774
3774
        'bzrlib.tests.test_sampler',
 
3775
        'bzrlib.tests.test_script',
3775
3776
        'bzrlib.tests.test_selftest',
3776
3777
        'bzrlib.tests.test_serializer',
3777
3778
        'bzrlib.tests.test_setup',