~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_selftest.py

Move doctest import to increase speed

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
39
38
 
40
39
 
41
40
class SelftestTests(TestCase):
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')
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')