← 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

Fix test_upgrade defects related to non local or absent working trees.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_join.py
1
 
# Copyright (C) 2006, 2010 Canonical Ltd
 
1
# Copyright (C) 2006 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
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
 
18
18
import os
19
19
 
20
 
from bzrlib import (
21
 
    bzrdir,
22
 
    osutils,
23
 
    repository,
24
 
    tests,
25
 
    workingtree,
26
 
    )
 
20
from bzrlib import bzrdir, repository, tests, workingtree
27
21
 
28
22
 
29
23
class TestJoin(tests.TestCaseWithTransport):
30
24
 
31
25
    def make_trees(self):
32
26
        base_tree = self.make_branch_and_tree('tree',
33
 
            format='dirstate-with-subtree')
 
27
                                              format='experimental-reference-dirstate')
34
28
        base_tree.commit('empty commit')
35
29
        self.build_tree(['tree/subtree/', 'tree/subtree/file1'])
36
30
        sub_tree = self.make_branch_and_tree('tree/subtree')
45
39
 
46
40
    def test_join(self):
47
41
        base_tree, sub_tree = self.make_trees()
48
 
        self.run_bzr('join tree/subtree')
 
42
        self.run_bzr('join', 'tree/subtree')
49
43
        self.check_success('tree')
50
44
 
51
45
    def test_join_dot(self):
52
46
        base_tree, sub_tree = self.make_trees()
53
 
        self.run_bzr('join .', working_dir='tree/subtree')
 
47
        self.run_bzr('join', '.', working_dir='tree/subtree')
54
48
        self.check_success('tree')
55
49
 
56
50
    def test_join_error(self):
57
51
        base_tree, sub_tree = self.make_trees()
58
52
        os.mkdir('tree/subtree2')
59
 
        osutils.rename('tree/subtree', 'tree/subtree2/subtree')
60
 
        self.run_bzr_error(
61
 
            ('Cannot join .*subtree.  Parent directory is not versioned',),
62
 
             'join tree/subtree2/subtree')
63
 
        # disabled because this gives an ugly error at present -- mbp 20070306
64
 
        ## self.run_bzr_error(
65
 
        ##     ('Cannot join .*subtree.  Parent directory is not versioned',),
66
 
        ##      'join', '--reference', 'tree/subtree2/subtree')
67
 
        self.run_bzr_error(('Not a branch:.*subtree2',),
68
 
                           'join tree/subtree2')
 
53
        os.rename('tree/subtree', 'tree/subtree2/subtree')
 
54
        self.run_bzr_error(('Cannot join .*subtree.  Parent directory is not'
 
55
                            ' versioned',), 'join', 'tree/subtree2/subtree')
 
56
        self.run_bzr_error(('Not a branch:.*subtree2',), 'join', 
 
57
                            'tree/subtree2')
69
58
 
70
59
    def test_join_reference(self):
71
60
        """Join can add a reference if --reference is supplied"""
72
61
        base_tree, sub_tree = self.make_trees()
73
 
        self.run_bzr('join . --reference', working_dir='tree/subtree')
74
 
        sub_tree.lock_read()
75
 
        self.addCleanup(sub_tree.unlock)
 
62
        self.run_bzr('join', '.', '--reference', working_dir='tree/subtree')
 
63
        # Restore trees, because run_bzr is out-of-band
 
64
        base_tree = workingtree.WorkingTree.open('tree')
 
65
        sub_tree = workingtree.WorkingTree.open('tree/subtree')
76
66
        self.assertEqual('file1-id', sub_tree.path2id('file1'))
77
 
        self.assertTrue(sub_tree.has_id('file1-id'))
 
67
        self.assertTrue('file1-id' in sub_tree)
78
68
        self.assertEqual('subtree-root-id', sub_tree.path2id(''))
79
69
        self.assertEqual('', sub_tree.id2path('subtree-root-id'))
80
70
        self.assertIs(None, base_tree.path2id('subtree/file1'))
81
 
        base_tree.lock_read()
82
 
        self.addCleanup(base_tree.unlock)
83
 
        self.assertFalse(base_tree.has_id('file1-id'))
 
71
        self.assertTrue('file1-id' not in base_tree)
84
72
        self.assertEqual('subtree-root-id', base_tree.path2id('subtree'))
85
73
        self.assertEqual('subtree', base_tree.id2path('subtree-root-id'))
86
 
 
87
 
    def test_references_check_repository_support(self):
88
 
        """Users are stopped from adding a reference that can't be committed."""
89
 
        # in 0.15 the default format has a dirstate workingtree, that can
90
 
        # support tree references, but the default repository format
91
 
        # cannot.
92
 
        tree = self.make_branch_and_tree('tree', format='dirstate')
93
 
        tree2 = self.make_branch_and_tree('tree/subtree')
94
 
        out, err = self.run_bzr('join --reference tree/subtree',
95
 
                                retcode=3)
96
 
        self.assertContainsRe(err, r"Can't join trees")
97
 
        self.assertContainsRe(err, r"use bzr upgrade")