← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_ancestry.py

  • Committer: Martin Pool
  • Date: 2007-06-26 10:12:33 UTC
  • mto: This revision was merged to the branch mainline in revision 2555.
  • Revision ID: mbp@sourcefrog.net-20070626101233-hrmvl09320gt6b8m
Deprecate run_bzr_captured in favour of just  run_bzr

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_ancestry.py
29
29
        open('A/foo', 'wb').write('1111\n')
30
30
        a_wt.add('foo')
31
31
        a_wt.commit('added foo',rev_id='A1')
32
 
        self.run_bzr_captured(['branch', 'A', 'B'])
 
32
        self.run_bzr(['branch', 'A', 'B'])
33
33
        b_wt = WorkingTree.open('B')
34
34
        open('B/foo','wb').write('1111\n22\n')
35
35
        b_wt.commit('modified B/foo',rev_id='B1')
39
39
        a_wt.commit('merged B into A',rev_id='A3')
40
40
 
41
41
    def _check_ancestry(self, location='', result=None):
42
 
        out = self.run_bzr_captured(['ancestry', location])[0]
 
42
        out = self.run_bzr(['ancestry', location])[0]
43
43
        if result is None:
44
44
            result = "A1\nB1\nA2\nA3\n"
45
45
        self.assertEqualDiff(out, result)