← 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: Aaron Bentley
  • Date: 2006-06-11 21:26:20 UTC
  • mto: This revision was merged to the branch mainline in revision 1764.
  • Revision ID: aaron.bentley@utoronto.ca-20060611212620-2517ff1406176fd9
Rename run_bzr_external -> run_bzr_subprocess, add docstring

Show diffs side-by-side

added added

removed removed

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