← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Vincent Ladeuil
  • Date: 2012-02-14 17:22:37 UTC
  • mfrom: (6466 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6468.
  • Revision ID: v.ladeuil+lp@free.fr-20120214172237-7dv7er3n4uy8d5m4
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_join.py
30
30
 
31
31
    def make_trees(self):
32
32
        base_tree = self.make_branch_and_tree('tree',
33
 
            format='dirstate-with-subtree')
 
33
            format='development-subtree')
34
34
        base_tree.commit('empty commit')
35
35
        self.build_tree(['tree/subtree/', 'tree/subtree/file1'])
36
36
        sub_tree = self.make_branch_and_tree('tree/subtree')
74
74
        sub_tree.lock_read()
75
75
        self.addCleanup(sub_tree.unlock)
76
76
        self.assertEqual('file1-id', sub_tree.path2id('file1'))
77
 
        self.assertTrue('file1-id' in sub_tree)
 
77
        self.assertTrue(sub_tree.has_id('file1-id'))
78
78
        self.assertEqual('subtree-root-id', sub_tree.path2id(''))
79
79
        self.assertEqual('', sub_tree.id2path('subtree-root-id'))
80
80
        self.assertIs(None, base_tree.path2id('subtree/file1'))
81
81
        base_tree.lock_read()
82
82
        self.addCleanup(base_tree.unlock)
83
 
        self.assertTrue('file1-id' not in base_tree)
 
83
        self.assertFalse(base_tree.has_id('file1-id'))
84
84
        self.assertEqual('subtree-root-id', base_tree.path2id('subtree'))
85
85
        self.assertEqual('subtree', base_tree.id2path('subtree-root-id'))
86
86
 
95
95
                                retcode=3)
96
96
        self.assertContainsRe(err, r"Can't join trees")
97
97
        self.assertContainsRe(err, r"use bzr upgrade")
98
 
 
99