/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_subsume.py

Test_info needed updating after freezing the meaning of 'knit' format dirs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_subsume.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
from bzrlib import bzrdir, errors, repository, workingtree, tests
18
18
 
22
22
    def make_branch_and_tree(self, relpath, format=None):
23
23
        if format is None:
24
24
            format = 'dirstate-with-subtree'
25
 
        return tests.TestCaseWithTransport.make_branch_and_tree(self, relpath,
 
25
        return tests.TestCaseWithTransport.make_branch_and_tree(self, relpath, 
26
26
                                                                format)
27
27
 
28
28
    def make_trees(self, format=None, same_root=False):
49
49
        """
50
50
        base_tree, sub_tree = self.make_trees(format='knit',
51
51
                                              same_root=True)
52
 
        self.assertRaises(errors.BadSubsumeSource, base_tree.subsume,
 
52
        self.assertRaises(errors.BadSubsumeSource, base_tree.subsume, 
53
53
                          sub_tree)
54
54
 
55
55
    def test_knit1_failure(self):
56
56
        base_tree, sub_tree = self.make_trees(format='knit')
57
 
        self.assertRaises(errors.SubsumeTargetNeedsUpgrade, base_tree.subsume,
 
57
        self.assertRaises(errors.SubsumeTargetNeedsUpgrade, base_tree.subsume, 
58
58
                          sub_tree)
59
59
 
60
60
    def test_subsume_tree(self):
61
61
        base_tree, sub_tree = self.make_trees()
62
 
        self.assertNotEqual(base_tree.get_root_id(), sub_tree.get_root_id())
 
62
        assert base_tree.get_root_id() != sub_tree.get_root_id()
63
63
        sub_root_id = sub_tree.get_root_id()
64
 
        # this test checks the subdir is removed, so it needs to know the
65
 
        # control directory; that changes rarely so just hardcode (and check)
66
 
        # it is correct.
67
 
        self.failUnlessExists('tree/subtree/.bzr')
68
64
        base_tree.subsume(sub_tree)
69
65
        self.assertEqual(['tree-1', 'subtree-1'], base_tree.get_parent_ids())
70
66
        self.assertEqual(sub_root_id, base_tree.path2id('subtree'))
71
67
        self.assertEqual('file2-id', base_tree.path2id('subtree/file2'))
72
 
        # subsuming the tree removes the control directory, so you can't open
73
 
        # it.
74
 
        self.failIfExists('tree/subtree/.bzr')
 
68
        sub_bzrdir = bzrdir.BzrDir.open('tree/subtree')
 
69
        self.assertRaises(errors.NoWorkingTree, sub_bzrdir.open_workingtree)
 
70
        sub_bzrdir.open_branch()
75
71
        file2 = open('tree/subtree/file2', 'rb')
76
72
        try:
77
73
            file2_contents = file2.read()
100
96
        if base_tree.get_root_id() == sub_tree.get_root_id():
101
97
            raise tests.TestSkipped('This test requires unique roots')
102
98
        sub_root_id = sub_tree.get_root_id()
103
 
        self.assertRaises(errors.BadSubsumeSource, base_tree.subsume,
 
99
        self.assertRaises(errors.BadSubsumeSource, base_tree.subsume, 
104
100
                          base_tree)
105
 
        self.assertRaises(errors.BadSubsumeSource, sub_tree.subsume,
 
101
        self.assertRaises(errors.BadSubsumeSource, sub_tree.subsume, 
106
102
                          base_tree)
107
103
        self.build_tree(['subtree2/'])
108
104
        sub_tree2 = self.make_branch_and_tree('subtree2')
109
 
        self.assertRaises(errors.BadSubsumeSource, sub_tree.subsume,
 
105
        self.assertRaises(errors.BadSubsumeSource, sub_tree.subsume, 
110
106
                          sub_tree2)
111
107
        self.build_tree(['tree/subtree/subtree3/'])
112
108
        sub_tree3 = self.make_branch_and_tree('tree/subtree/subtree3')