/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
6614.1.3 by Vincent Ladeuil
Fix assertEquals being deprecated by using assertEqual.
1
# Copyright (C) 2006-2012, 2016 Canonical Ltd
1836.1.13 by John Arbash Meinel
Adding functions for getting user ignores.
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1836.1.13 by John Arbash Meinel
Adding functions for getting user ignores.
16
17
"""Tests for handling of ignore files"""
18
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
19
from .. import (
5579.3.1 by Jelmer Vernooij
Remove unused imports.
20
    config,
21
    ignores,
22
    )
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
23
from ..sixish import (
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
24
    BytesIO,
25
    )
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
26
from . import (
5579.3.1 by Jelmer Vernooij
Remove unused imports.
27
    TestCase,
28
    TestCaseInTempDir,
29
    TestCaseWithTransport,
30
    )
1836.1.13 by John Arbash Meinel
Adding functions for getting user ignores.
31
32
33
class TestParseIgnoreFile(TestCase):
34
35
    def test_parse_fancy(self):
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
36
        ignored = ignores.parse_ignore_file(BytesIO(
1836.1.13 by John Arbash Meinel
Adding functions for getting user ignores.
37
                './rootdir\n'
38
                'randomfile*\n'
39
                'path/from/ro?t\n'
40
                'unicode\xc2\xb5\n' # u'\xb5'.encode('utf8')
41
                'dos\r\n'
42
                '\n' # empty line
43
                '#comment\n'
44
                ' xx \n' # whitespace
4948.5.4 by John Whitley
bzrlib.globbing.normalize_pattern needed fix to avoid mangling ignore
45
                '!RE:^\.z.*\n'
4948.5.6 by John Whitley
A trial implementation of '!!' syntax for double-negative ignore exclusions.
46
                '!!./.zcompdump\n'
1836.1.13 by John Arbash Meinel
Adding functions for getting user ignores.
47
                ))
6619.3.12 by Jelmer Vernooij
Use 2to3 set_literal fixer.
48
        self.assertEqual({'./rootdir',
1836.1.25 by John Arbash Meinel
cleanups suggested by Martin.
49
                          'randomfile*',
50
                          'path/from/ro?t',
51
                          u'unicode\xb5',
52
                          'dos',
53
                          ' xx ',
4948.5.4 by John Whitley
bzrlib.globbing.normalize_pattern needed fix to avoid mangling ignore
54
                          '!RE:^\.z.*',
4948.5.6 by John Whitley
A trial implementation of '!!' syntax for double-negative ignore exclusions.
55
                          '!!./.zcompdump',
6619.3.12 by Jelmer Vernooij
Use 2to3 set_literal fixer.
56
                         }, ignored)
1836.1.25 by John Arbash Meinel
cleanups suggested by Martin.
57
1836.1.13 by John Arbash Meinel
Adding functions for getting user ignores.
58
    def test_parse_empty(self):
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
59
        ignored = ignores.parse_ignore_file(BytesIO(b''))
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
60
        self.assertEqual(set([]), ignored)
5119.1.4 by Jason Spashett
Add test for parsing non utf8
61
        
62
    def test_parse_non_utf8(self):
63
        """Lines with non utf 8 characters should be discarded."""
6621.22.2 by Martin
Use BytesIO or StringIO from bzrlib.sixish
64
        ignored = ignores.parse_ignore_file(BytesIO(
5119.1.4 by Jason Spashett
Add test for parsing non utf8
65
                'utf8filename_a\n'
66
                'invalid utf8\x80\n'
67
                'utf8filename_b\n'
68
                ))
6619.3.12 by Jelmer Vernooij
Use 2to3 set_literal fixer.
69
        self.assertEqual({
5119.1.4 by Jason Spashett
Add test for parsing non utf8
70
                        'utf8filename_a',
71
                        'utf8filename_b',
6619.3.12 by Jelmer Vernooij
Use 2to3 set_literal fixer.
72
                       }, ignored)
1836.1.13 by John Arbash Meinel
Adding functions for getting user ignores.
73
74
1836.1.15 by John Arbash Meinel
Updated WorkingTree to use the new user-level ignores.
75
class TestUserIgnores(TestCaseInTempDir):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
76
1836.1.13 by John Arbash Meinel
Adding functions for getting user ignores.
77
    def test_create_if_missing(self):
78
        # $HOME should be set to '.'
79
        ignore_path = config.user_ignore_config_filename()
5784.1.3 by Martin Pool
Switch away from using failUnlessExists and failIfExists
80
        self.assertPathDoesNotExist(ignore_path)
1836.1.13 by John Arbash Meinel
Adding functions for getting user ignores.
81
        user_ignores = ignores.get_user_ignores()
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
82
        self.assertEqual(set(ignores.USER_DEFAULTS), user_ignores)
1836.1.13 by John Arbash Meinel
Adding functions for getting user ignores.
83
5784.1.3 by Martin Pool
Switch away from using failUnlessExists and failIfExists
84
        self.assertPathExists(ignore_path)
1836.1.13 by John Arbash Meinel
Adding functions for getting user ignores.
85
        f = open(ignore_path, 'rb')
86
        try:
87
            entries = ignores.parse_ignore_file(f)
88
        finally:
89
            f.close()
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
90
        self.assertEqual(set(ignores.USER_DEFAULTS), entries)
1836.1.13 by John Arbash Meinel
Adding functions for getting user ignores.
91
92
    def test_use_existing(self):
93
        patterns = ['*.o', '*.py[co]', u'\xe5*']
1836.1.31 by John Arbash Meinel
Make set_user_ignores a private function, and update the doc string to recommend it isn't used.
94
        ignores._set_user_ignores(patterns)
1836.1.13 by John Arbash Meinel
Adding functions for getting user ignores.
95
96
        user_ignores = ignores.get_user_ignores()
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
97
        self.assertEqual(set(patterns), user_ignores)
1836.1.14 by John Arbash Meinel
Adding a helper function that will only add patterns if they are missing.
98
99
    def test_use_empty(self):
1836.1.31 by John Arbash Meinel
Make set_user_ignores a private function, and update the doc string to recommend it isn't used.
100
        ignores._set_user_ignores([])
1836.1.14 by John Arbash Meinel
Adding a helper function that will only add patterns if they are missing.
101
        ignore_path = config.user_ignore_config_filename()
1836.1.15 by John Arbash Meinel
Updated WorkingTree to use the new user-level ignores.
102
        self.check_file_contents(ignore_path, '')
1836.1.14 by John Arbash Meinel
Adding a helper function that will only add patterns if they are missing.
103
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
104
        self.assertEqual(set([]), ignores.get_user_ignores())
1836.1.14 by John Arbash Meinel
Adding a helper function that will only add patterns if they are missing.
105
1836.1.15 by John Arbash Meinel
Updated WorkingTree to use the new user-level ignores.
106
    def test_set(self):
107
        patterns = ['*.py[co]', '*.py[oc]']
1836.1.31 by John Arbash Meinel
Make set_user_ignores a private function, and update the doc string to recommend it isn't used.
108
        ignores._set_user_ignores(patterns)
1836.1.15 by John Arbash Meinel
Updated WorkingTree to use the new user-level ignores.
109
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
110
        self.assertEqual(set(patterns), ignores.get_user_ignores())
1836.1.15 by John Arbash Meinel
Updated WorkingTree to use the new user-level ignores.
111
112
        patterns = ['vim', '*.swp']
1836.1.31 by John Arbash Meinel
Make set_user_ignores a private function, and update the doc string to recommend it isn't used.
113
        ignores._set_user_ignores(patterns)
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
114
        self.assertEqual(set(patterns), ignores.get_user_ignores())
1836.1.15 by John Arbash Meinel
Updated WorkingTree to use the new user-level ignores.
115
1836.1.14 by John Arbash Meinel
Adding a helper function that will only add patterns if they are missing.
116
    def test_add(self):
117
        """Test that adding will not duplicate ignores"""
118
        # Create an empty file
1836.1.31 by John Arbash Meinel
Make set_user_ignores a private function, and update the doc string to recommend it isn't used.
119
        ignores._set_user_ignores([])
1836.1.14 by John Arbash Meinel
Adding a helper function that will only add patterns if they are missing.
120
121
        patterns = ['foo', './bar', u'b\xe5z']
122
        added = ignores.add_unique_user_ignores(patterns)
123
        self.assertEqual(patterns, added)
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
124
        self.assertEqual(set(patterns), ignores.get_user_ignores())
1836.1.14 by John Arbash Meinel
Adding a helper function that will only add patterns if they are missing.
125
2077.1.2 by Kent Gibson
Strip trailing slashes from ignore patterns (#4559).
126
    def test_add_directory(self):
127
        """Test that adding a directory will strip any trailing slash"""
128
        # Create an empty file
129
        ignores._set_user_ignores([])
130
2298.8.3 by Kent Gibson
Extended test cases to test bug 86451.
131
        in_patterns = ['foo/', 'bar/', 'baz\\']
2077.1.2 by Kent Gibson
Strip trailing slashes from ignore patterns (#4559).
132
        added = ignores.add_unique_user_ignores(in_patterns)
2298.8.3 by Kent Gibson
Extended test cases to test bug 86451.
133
        out_patterns = [ x.rstrip('/\\') for x in in_patterns ]
2077.1.2 by Kent Gibson
Strip trailing slashes from ignore patterns (#4559).
134
        self.assertEqual(out_patterns, added)
135
        self.assertEqual(set(out_patterns), ignores.get_user_ignores())
136
1836.1.14 by John Arbash Meinel
Adding a helper function that will only add patterns if they are missing.
137
    def test_add_unique(self):
138
        """Test that adding will not duplicate ignores"""
2298.8.3 by Kent Gibson
Extended test cases to test bug 86451.
139
        ignores._set_user_ignores(
140
            ['foo', './bar', u'b\xe5z', 'dir1/', 'dir3\\'])
1836.1.14 by John Arbash Meinel
Adding a helper function that will only add patterns if they are missing.
141
2077.1.2 by Kent Gibson
Strip trailing slashes from ignore patterns (#4559).
142
        added = ignores.add_unique_user_ignores(
2298.8.3 by Kent Gibson
Extended test cases to test bug 86451.
143
            ['xxx', './bar', 'xxx', 'dir1/', 'dir2/', 'dir3\\'])
2077.1.2 by Kent Gibson
Strip trailing slashes from ignore patterns (#4559).
144
        self.assertEqual(['xxx', 'dir2'], added)
6619.3.12 by Jelmer Vernooij
Use 2to3 set_literal fixer.
145
        self.assertEqual({'foo', './bar', u'b\xe5z',
146
                              'xxx', 'dir1', 'dir2', 'dir3'},
1836.1.14 by John Arbash Meinel
Adding a helper function that will only add patterns if they are missing.
147
                         ignores.get_user_ignores())
1836.1.28 by John Arbash Meinel
Add a function for adding runtime ignores.
148
149
150
class TestRuntimeIgnores(TestCase):
151
152
    def setUp(self):
6552.1.4 by Vincent Ladeuil
Remaining tests matching setup(self) that can be rewritten with super().
153
        super(TestRuntimeIgnores, self).setUp()
1836.1.28 by John Arbash Meinel
Add a function for adding runtime ignores.
154
155
        # For the purposes of these tests, we must have no
156
        # runtime ignores
4985.1.5 by Vincent Ladeuil
Deploying the new overrideAttr facility further reduces the complexity
157
        self.overrideAttr(ignores, '_runtime_ignores', set())
1836.1.28 by John Arbash Meinel
Add a function for adding runtime ignores.
158
159
    def test_add(self):
160
        """Test that we can add an entry to the list."""
161
        self.assertEqual(set(), ignores.get_runtime_ignores())
162
163
        ignores.add_runtime_ignores(['foo'])
6619.3.12 by Jelmer Vernooij
Use 2to3 set_literal fixer.
164
        self.assertEqual({'foo'}, ignores.get_runtime_ignores())
1836.1.28 by John Arbash Meinel
Add a function for adding runtime ignores.
165
166
    def test_add_duplicate(self):
167
        """Adding the same ignore twice shouldn't add a new entry."""
168
        ignores.add_runtime_ignores(['foo', 'bar'])
6619.3.12 by Jelmer Vernooij
Use 2to3 set_literal fixer.
169
        self.assertEqual({'foo', 'bar'}, ignores.get_runtime_ignores())
1836.1.28 by John Arbash Meinel
Add a function for adding runtime ignores.
170
171
        ignores.add_runtime_ignores(['bar'])
6619.3.12 by Jelmer Vernooij
Use 2to3 set_literal fixer.
172
        self.assertEqual({'foo', 'bar'}, ignores.get_runtime_ignores())
3528.2.1 by Jelmer Vernooij
Move functionality to add ignores to the ignore file into a separate function.
173
174
175
class TestTreeIgnores(TestCaseWithTransport):
5195.2.1 by Gordon Tyler
Fixed tree_ignores_add_patterns to not duplicate existing patterns in the ignore file.
176
    
177
    def assertPatternsEquals(self, patterns):
5195.2.8 by Gordon Tyler
Fixed preservation of existing line endings and added tests for that and Unicode handling.
178
        contents = open(".bzrignore", 'rU').read().strip().split('\n')
6614.1.3 by Vincent Ladeuil
Fix assertEquals being deprecated by using assertEqual.
179
        self.assertEqual(sorted(patterns), sorted(contents))
3528.2.1 by Jelmer Vernooij
Move functionality to add ignores to the ignore file into a separate function.
180
181
    def test_new_file(self):
182
        tree = self.make_branch_and_tree(".")
183
        ignores.tree_ignores_add_patterns(tree, ["myentry"])
184
        self.assertTrue(tree.has_filename(".bzrignore"))
5195.2.1 by Gordon Tyler
Fixed tree_ignores_add_patterns to not duplicate existing patterns in the ignore file.
185
        self.assertPatternsEquals(["myentry"])
3528.2.1 by Jelmer Vernooij
Move functionality to add ignores to the ignore file into a separate function.
186
187
    def test_add_to_existing(self):
188
        tree = self.make_branch_and_tree(".")
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
189
        self.build_tree_contents([('.bzrignore', "myentry1\n")])
3528.2.1 by Jelmer Vernooij
Move functionality to add ignores to the ignore file into a separate function.
190
        tree.add([".bzrignore"])
191
        ignores.tree_ignores_add_patterns(tree, ["myentry2", "foo"])
5195.2.1 by Gordon Tyler
Fixed tree_ignores_add_patterns to not duplicate existing patterns in the ignore file.
192
        self.assertPatternsEquals(["myentry1", "myentry2", "foo"])
3528.2.1 by Jelmer Vernooij
Move functionality to add ignores to the ignore file into a separate function.
193
194
    def test_adds_ending_newline(self):
195
        tree = self.make_branch_and_tree(".")
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
196
        self.build_tree_contents([('.bzrignore', "myentry1")])
3528.2.1 by Jelmer Vernooij
Move functionality to add ignores to the ignore file into a separate function.
197
        tree.add([".bzrignore"])
198
        ignores.tree_ignores_add_patterns(tree, ["myentry2"])
5195.2.1 by Gordon Tyler
Fixed tree_ignores_add_patterns to not duplicate existing patterns in the ignore file.
199
        self.assertPatternsEquals(["myentry1", "myentry2"])
200
        text = open(".bzrignore", 'r').read()
201
        self.assertTrue(text.endswith('\r\n') or
202
                        text.endswith('\n') or
203
                        text.endswith('\r'))
3528.2.1 by Jelmer Vernooij
Move functionality to add ignores to the ignore file into a separate function.
204
5195.2.1 by Gordon Tyler
Fixed tree_ignores_add_patterns to not duplicate existing patterns in the ignore file.
205
    def test_does_not_add_dupe(self):
206
        tree = self.make_branch_and_tree(".")
207
        self.build_tree_contents([('.bzrignore', "myentry\n")])
208
        tree.add([".bzrignore"])
209
        ignores.tree_ignores_add_patterns(tree, ["myentry"])
210
        self.assertPatternsEquals(["myentry"])
5195.2.8 by Gordon Tyler
Fixed preservation of existing line endings and added tests for that and Unicode handling.
211
212
    def test_non_ascii(self):
213
        tree = self.make_branch_and_tree(".")
214
        self.build_tree_contents([('.bzrignore',
215
                                   u"myentry\u1234\n".encode('utf-8'))])
216
        tree.add([".bzrignore"])
217
        ignores.tree_ignores_add_patterns(tree, [u"myentry\u5678"])
218
        self.assertPatternsEquals([u"myentry\u1234".encode('utf-8'),
219
                                   u"myentry\u5678".encode('utf-8')])
220
221
    def test_crlf(self):
222
        tree = self.make_branch_and_tree(".")
223
        self.build_tree_contents([('.bzrignore', "myentry1\r\n")])
224
        tree.add([".bzrignore"])
225
        ignores.tree_ignores_add_patterns(tree, ["myentry2", "foo"])
6614.1.3 by Vincent Ladeuil
Fix assertEquals being deprecated by using assertEqual.
226
        self.assertEqual(open('.bzrignore', 'rb').read(), 'myentry1\r\nmyentry2\r\nfoo\r\n')
5195.2.8 by Gordon Tyler
Fixed preservation of existing line endings and added tests for that and Unicode handling.
227
        self.assertPatternsEquals(["myentry1", "myentry2", "foo"])