~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/blackbox.py

  • Committer: Martin Pool
  • Date: 2005-09-18 01:08:03 UTC
  • mto: (1185.8.2) (974.1.91)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: mbp@sourcefrog.net-20050918010803-59dc14add451c6b0
- run some previously external tests in process

Show diffs side-by-side

added added

removed removed

Lines of Context:
35
35
 
36
36
 
37
37
class ExternalBase(TestCaseInTempDir):
38
 
    def runbzr(self, args, retcode=0,backtick=False):
 
38
    def runbzr(self, args, retcode=0, backtick=False):
39
39
        if isinstance(args, basestring):
40
40
            args = args.split()
41
41
 
42
42
        if backtick:
43
 
            return self.backtick(['python', self.BZRPATH,] + args,
44
 
                           retcode=retcode)
 
43
            return self.run_bzr_captured(args, retcode=retcode)[0]
45
44
        else:
46
 
            return self.runcmd(['python', self.BZRPATH,] + args,
47
 
                           retcode=retcode)
 
45
            return self.run_bzr_captured(args, retcode=retcode)
48
46
 
49
47
 
50
48
class TestCommands(ExternalBase):
280
278
 
281
279
    def test_unknown_command(self):
282
280
        """Handling of unknown command."""
 
281
        from bzrlib.commands import main
 
282
        
283
283
        out, err = self.run_bzr_captured(['fluffy-badger'],
284
284
                                         retcode=1)
285
285
        self.assertEquals(out, '')