← 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: Jelmer Vernooij
  • Date: 2011-05-10 07:46:15 UTC
  • mfrom: (5844 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5845.
  • Revision ID: jelmer@samba.org-20110510074615-eptod049ndjxc4i7
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
90
90
        os.chdir('branch2')
91
91
        self.run_bzr('merge ../branch1/baz', retcode=3)
92
92
        self.run_bzr('merge ../branch1/foo')
93
 
        self.failUnlessExists('foo')
94
 
        self.failIfExists('bar')
 
93
        self.assertPathExists('foo')
 
94
        self.assertPathDoesNotExist('bar')
95
95
        wt2 = WorkingTree.open('.') # opens branch2
96
96
        self.assertEqual([tip], wt2.get_parent_ids())
97
97
 
157
157
        log = StringIO()
158
158
        merge_inner(tree_b.branch, tree_a, tree_b.basis_tree(),
159
159
                    this_tree=tree_b, ignore_zero=True)
160
 
        self.failUnless('All changes applied successfully.\n' not in
 
160
        self.assertTrue('All changes applied successfully.\n' not in
161
161
            self.get_log())
162
162
        tree_b.revert()
163
163
        merge_inner(tree_b.branch, tree_a, tree_b.basis_tree(),
164
164
                    this_tree=tree_b, ignore_zero=False)
165
 
        self.failUnless('All changes applied successfully.\n' in self.get_log())
 
165
        self.assertTrue('All changes applied successfully.\n' in self.get_log())
166
166
 
167
167
    def test_merge_inner_conflicts(self):
168
168
        tree_a = self.make_branch_and_tree('a')