/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

  • Committer: Robert Collins
  • Date: 2006-07-03 08:12:23 UTC
  • mfrom: (1832 +trunk)
  • mto: (1832.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 1833.
  • Revision ID: robertc@robertcollins.net-20060703081223-b106037c3fb29160
Merge from integration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_selftest.py
35
35
                          )
36
36
from bzrlib.tests.TestUtil import _load_module_by_name
37
37
import bzrlib.errors as errors
 
38
from bzrlib.trace import note
38
39
 
39
40
 
40
41
class SelftestTests(TestCase):
693
694
        err = self.run_bzr_subprocess('merge', '--merge-type', 'magic merge', 
694
695
                                      retcode=3)[1]
695
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')