/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 breezy/tests/per_workingtree/test_symlinks.py

  • Committer: Jelmer Vernooij
  • Date: 2018-03-24 17:48:04 UTC
  • mfrom: (6921 work)
  • mto: This revision was merged to the branch mainline in revision 6923.
  • Revision ID: jelmer@jelmer.uk-20180324174804-xf22o05byoj12x1q
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_workingtree/test_symlinks.py
42
42
            ('tree/link@', 'target'),
43
43
            ])
44
44
        tree.smart_add(['tree/link'])
45
 
        self.assertIsNot(None, tree.path2id('link'))
46
 
        self.assertIs(None, tree.path2id('target'))
 
45
        self.assertTrue(tree.is_versioned('link'))
 
46
        self.assertFalse(tree.is_versioned('target'))
47
47
        self.assertEqual('symlink', tree.kind('link'))
48
48
 
49
49
    def test_smart_add_symlink_pointing_outside(self):
52
52
            ('tree/link@', '../../../../target'),
53
53
            ])
54
54
        tree.smart_add(['tree/link'])
55
 
        self.assertIsNot(None, tree.path2id('link'))
56
 
        self.assertIs(None, tree.path2id('target'))
 
55
        self.assertTrue(tree.is_versioned('link'))
 
56
        self.assertFalse(tree.is_versioned('target'))
57
57
        self.assertEqual('symlink', tree.kind('link'))
58
58
 
59
59
    def test_add_file_under_symlink(self):
65
65
            ('tree/dir/',),
66
66
            ('tree/dir/file', 'content'),
67
67
            ])
68
 
        self.assertEqual(
69
 
            tree.smart_add(['tree/link/file']),
70
 
            ([u'dir', u'dir/file'], {}))
 
68
        if tree.has_versioned_directories():
 
69
            self.assertEqual(
 
70
                tree.smart_add(['tree/link/file']),
 
71
                ([u'dir', u'dir/file'], {}))
 
72
        else:
 
73
            self.assertEqual(
 
74
                tree.smart_add(['tree/link/file']),
 
75
                ([u'dir/file'], {}))
 
76
 
71
77
        # should add the actual parent directory, not the apparent parent
72
78
        # (which is actually a symlink)
73
 
        self.assertTrue(tree.path2id('dir/file'))
74
 
        self.assertTrue(tree.path2id('dir'))
75
 
        self.assertIs(None, tree.path2id('link'))
76
 
        self.assertIs(None, tree.path2id('link/file'))
 
79
        self.assertTrue(tree.is_versioned('dir/file'))
 
80
        self.assertTrue(tree.is_versioned('dir'))
 
81
        self.assertFalse(tree.is_versioned('link'))
 
82
        self.assertFalse(tree.is_versioned('link/file'))
77
83
 
78
84
 
79
85
class TestKindChanges(TestCaseWithWorkingTree):
102
108
        tree.lock_read()
103
109
        self.addCleanup(tree.unlock)
104
110
        self.assertEqual([], list(tree.iter_changes(tree.basis_tree())))
105
 
        if tree._format.supports_versioned_directories:
106
 
            self.assertEqual(
107
 
                ['a', 'a/f'], sorted(info[0] for info in tree.list_files()))
108
 
        else:
109
 
            self.assertEqual([], list(tree.list_files()))
 
111
        self.assertEqual(
 
112
            ['a', 'a/f'], sorted(info[0] for info in tree.list_files()))
110
113
 
111
114
    def test_dir_changes_to_symlink(self):
112
115
        # <https://bugs.launchpad.net/bzr/+bug/192859>: