/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_selftest.py

  • Committer: Aaron Bentley
  • Date: 2007-02-09 07:16:20 UTC
  • mfrom: (2272 +trunk)
  • mto: (2255.6.1 dirstate)
  • mto: This revision was merged to the branch mainline in revision 2322.
  • Revision ID: aaron.bentley@utoronto.ca-20070209071620-gp2n7vtjyb0f2x1e
Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_selftest.py
262
262
        self.assertContainsRe(result[1], 'unknown command')
263
263
        err = self.run_bzr_subprocess('merge', '--merge-type', 'magic merge', 
264
264
                                      retcode=3)[1]
265
 
        self.assertContainsRe(err, 'No known merge type magic merge')
 
265
        self.assertContainsRe(err, 'Bad value "magic merge" for option'
 
266
                              ' "merge-type"')
266
267
 
267
268
    def test_run_bzr_subprocess_env(self):
268
269
        """run_bzr_subprocess can set environment variables in the child only.