← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_selftest.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-06-12 01:12:14 UTC
  • mfrom: (1752.1.7 configobj)
  • Revision ID: pqm@pqm.ubuntu.com-20060612011214-3f50082086eb3ef6
Stop using shlex in run_bzr_subprocess

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_selftest.py
683
683
    def test_run_bzr_subprocess(self):
684
684
        """The run_bzr_helper_external comand behaves nicely."""
685
685
        result = self.run_bzr_subprocess('--version')
 
686
        result = self.run_bzr_subprocess('--version', retcode=None)
686
687
        self.assertContainsRe(result[0], 'is free software')
687
688
        self.assertRaises(AssertionError, self.run_bzr_subprocess, 
688
689
                          '--versionn')
689
690
        result = self.run_bzr_subprocess('--versionn', retcode=3)
 
691
        result = self.run_bzr_subprocess('--versionn', retcode=None)
690
692
        self.assertContainsRe(result[1], 'unknown command')
691
 
        err = self.run_bzr_subprocess('merge --merge-type "magic merge"', 
692
 
                                      retcode=3)[1]
693
 
        self.assertContainsRe(err, 'No known merge type magic merge')
694
693
        err = self.run_bzr_subprocess('merge', '--merge-type', 'magic merge', 
695
694
                                      retcode=3)[1]
696
695
        self.assertContainsRe(err, 'No known merge type magic merge')