← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/blackbox.py

  • Committer: Martin Pool
  • Date: 2005-08-29 03:54:30 UTC
  • Revision ID: mbp@sourcefrog.net-20050829035430-d91ba6c9feabf103
- remove one message to stdout from the test suite

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/blackbox.py
29
29
import sys
30
30
from bzrlib.selftest import InTempDir, BzrTestBase
31
31
 
32
 
 
33
32
class ExternalBase(InTempDir):
34
33
 
35
34
    def runbzr(self, args, retcode=0,backtick=False):
379
378
class MergeCommand(ExternalBase):
380
379
    def runTest(self):
381
380
        from bzrlib.branch import Branch
 
381
        from bzrlib.commands import run_bzr
382
382
        import os
 
383
        
383
384
        os.mkdir('a')
384
385
        os.chdir('a')
 
386
 
385
387
        example_branch(self)
386
388
        os.chdir('..')
387
389
        self.runbzr('branch a b')
400
402
        a = Branch('.')
401
403
        b = Branch('../b')
402
404
        a.get_revision_xml(b.last_patch())
403
 
        print "Pending: %s" % a.pending_merges()
 
405
 
 
406
        self.log('pending merges: %s', a.pending_merges())
404
407
#        assert a.pending_merges() == [b.last_patch()], "Assertion %s %s" \
405
408
#        % (a.pending_merges(), b.last_patch())
406
409