← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-12-23 00:59:10 UTC
  • mfrom: (4794.1.21 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20091223005910-zatr8ajlw8ul6d6s
(robertc) Add testtools 0.9.2 as a hard dependency to run the test
        suite, improving debug output on selftest --parallel,
        reducing code size and adding support for assertThat. (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
150
150
        log = StringIO()
151
151
        merge_inner(tree_b.branch, tree_a, tree_b.basis_tree(),
152
152
                    this_tree=tree_b, ignore_zero=True)
153
 
        log = self._get_log(keep_log_file=True)
154
 
        self.failUnless('All changes applied successfully.\n' not in log)
 
153
        self.failUnless('All changes applied successfully.\n' not in
 
154
            self.get_log())
155
155
        tree_b.revert()
156
156
        merge_inner(tree_b.branch, tree_a, tree_b.basis_tree(),
157
157
                    this_tree=tree_b, ignore_zero=False)
158
 
        log = self._get_log(keep_log_file=True)
159
 
        self.failUnless('All changes applied successfully.\n' in log)
 
158
        self.failUnless('All changes applied successfully.\n' in self.get_log())
160
159
 
161
160
    def test_merge_inner_conflicts(self):
162
161
        tree_a = self.make_branch_and_tree('a')