/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/test_selftest.py

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_selftest.py
694
694
        err = self.run_bzr_subprocess('merge', '--merge-type', 'magic merge', 
695
695
                                      retcode=3)[1]
696
696
        self.assertContainsRe(err, 'No known merge type magic merge')
 
697
 
 
698
    def test_run_bzr_error(self):
 
699
        out, err = self.run_bzr_error(['^$'], 'rocks', retcode=0)
 
700
        self.assertEqual(out, 'it sure does!\n')
 
701
 
 
702
        out, err = self.run_bzr_error(["'foobarbaz' is not a versioned file"],
 
703
                                      'file-id', 'foobarbaz')