/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-02-18 15:49:32 UTC
  • mfrom: (6857 trunk)
  • mto: This revision was merged to the branch mainline in revision 6928.
  • Revision ID: jelmer@jelmer.uk-20180218154932-q0ihqx714ms38j2u
Merge trink.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_workingtree/test_symlinks.py
42
42
            ('tree/link@', b'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):
70
70
            ([u'dir', u'dir/file'], {}))
71
71
        # should add the actual parent directory, not the apparent parent
72
72
        # (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'))
 
73
        self.assertTrue(tree.is_versioned('dir/file'))
 
74
        self.assertTrue(tree.is_versioned('dir'))
 
75
        self.assertFalse(tree.is_versioned('link'))
 
76
        self.assertFalse(tree.is_versioned('link/file'))
77
77
 
78
78
 
79
79
class TestKindChanges(TestCaseWithWorkingTree):