← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_workingtree/test_pull.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/per_workingtree/test_pull.py
33
33
    def test_pull(self):
34
34
        tree_a, tree_b = self.get_pullable_trees()
35
35
        tree_b.pull(tree_a.branch)
36
 
        self.failUnless(tree_b.branch.repository.has_revision('A'))
 
36
        self.assertTrue(tree_b.branch.repository.has_revision('A'))
37
37
        self.assertEqual(['A'], tree_b.get_parent_ids())
38
38
 
39
39
    def test_pull_overwrites(self):
41
41
        tree_b.commit('foo', rev_id='B')
42
42
        self.assertEqual(['B'], tree_b.branch.revision_history())
43
43
        tree_b.pull(tree_a.branch, overwrite=True)
44
 
        self.failUnless(tree_b.branch.repository.has_revision('A'))
45
 
        self.failUnless(tree_b.branch.repository.has_revision('B'))
 
44
        self.assertTrue(tree_b.branch.repository.has_revision('A'))
 
45
        self.assertTrue(tree_b.branch.repository.has_revision('B'))
46
46
        self.assertEqual(['A'], tree_b.get_parent_ids())
47
47
 
48
48
    def test_pull_merges_tree_content(self):
99
99
        work.pull(trunk)
100
100
        self.assertLength(0, work.conflicts())
101
101
        # The directory removal should succeed
102
 
        self.failIfExists('work/dir')
 
102
        self.assertPathDoesNotExist('work/dir')