/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 brzlib/tests/test_ignores.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-21 12:41:27 UTC
  • mto: This revision was merged to the branch mainline in revision 6623.
  • Revision ID: jelmer@jelmer.uk-20170521124127-iv8etg0vwymyai6y
s/bzr/brz/ in apport config.

Show diffs side-by-side

added added

removed removed

Lines of Context:
brzlib/tests/test_ignores.py
16
16
 
17
17
"""Tests for handling of ignore files"""
18
18
 
19
 
from io import BytesIO
20
 
import os
 
19
from cStringIO import StringIO
21
20
 
22
 
from .. import (
23
 
    bedding,
 
21
from brzlib import (
 
22
    config,
24
23
    ignores,
25
24
    )
26
 
from . import (
 
25
from brzlib.tests import (
27
26
    TestCase,
28
27
    TestCaseInTempDir,
29
28
    TestCaseWithTransport,
33
32
class TestParseIgnoreFile(TestCase):
34
33
 
35
34
    def test_parse_fancy(self):
36
 
        ignored = ignores.parse_ignore_file(BytesIO(
37
 
            b'./rootdir\n'
38
 
            b'randomfile*\n'
39
 
            b'path/from/ro?t\n'
40
 
            b'unicode\xc2\xb5\n'  # u'\xb5'.encode('utf8')
41
 
            b'dos\r\n'
42
 
            b'\n'  # empty line
43
 
            b'#comment\n'
44
 
            b' xx \n'  # whitespace
45
 
            b'!RE:^\\.z.*\n'
46
 
            b'!!./.zcompdump\n'
47
 
            ))
48
 
        self.assertEqual({u'./rootdir',
49
 
                          u'randomfile*',
50
 
                          u'path/from/ro?t',
 
35
        ignored = ignores.parse_ignore_file(StringIO(
 
36
                './rootdir\n'
 
37
                'randomfile*\n'
 
38
                'path/from/ro?t\n'
 
39
                'unicode\xc2\xb5\n' # u'\xb5'.encode('utf8')
 
40
                'dos\r\n'
 
41
                '\n' # empty line
 
42
                '#comment\n'
 
43
                ' xx \n' # whitespace
 
44
                '!RE:^\.z.*\n'
 
45
                '!!./.zcompdump\n'
 
46
                ))
 
47
        self.assertEqual(set(['./rootdir',
 
48
                          'randomfile*',
 
49
                          'path/from/ro?t',
51
50
                          u'unicode\xb5',
52
 
                          u'dos',
53
 
                          u' xx ',
54
 
                          u'!RE:^\\.z.*',
55
 
                          u'!!./.zcompdump',
56
 
                          }, ignored)
 
51
                          'dos',
 
52
                          ' xx ',
 
53
                          '!RE:^\.z.*',
 
54
                          '!!./.zcompdump',
 
55
                         ]), ignored)
57
56
 
58
57
    def test_parse_empty(self):
59
 
        ignored = ignores.parse_ignore_file(BytesIO(b''))
 
58
        ignored = ignores.parse_ignore_file(StringIO(''))
60
59
        self.assertEqual(set([]), ignored)
61
 
 
 
60
        
62
61
    def test_parse_non_utf8(self):
63
62
        """Lines with non utf 8 characters should be discarded."""
64
 
        ignored = ignores.parse_ignore_file(BytesIO(
65
 
            b'utf8filename_a\n'
66
 
            b'invalid utf8\x80\n'
67
 
            b'utf8filename_b\n'
68
 
            ))
69
 
        self.assertEqual({
70
 
            u'utf8filename_a',
71
 
            u'utf8filename_b',
72
 
            }, ignored)
 
63
        ignored = ignores.parse_ignore_file(StringIO(
 
64
                'utf8filename_a\n'
 
65
                'invalid utf8\x80\n'
 
66
                'utf8filename_b\n'
 
67
                ))
 
68
        self.assertEqual(set([
 
69
                        'utf8filename_a',
 
70
                        'utf8filename_b',
 
71
                       ]), ignored)
73
72
 
74
73
 
75
74
class TestUserIgnores(TestCaseInTempDir):
76
75
 
77
76
    def test_create_if_missing(self):
78
77
        # $HOME should be set to '.'
79
 
        ignore_path = bedding.user_ignore_config_path()
 
78
        ignore_path = config.user_ignore_config_filename()
80
79
        self.assertPathDoesNotExist(ignore_path)
81
80
        user_ignores = ignores.get_user_ignores()
82
81
        self.assertEqual(set(ignores.USER_DEFAULTS), user_ignores)
83
82
 
84
83
        self.assertPathExists(ignore_path)
85
 
        with open(ignore_path, 'rb') as f:
 
84
        f = open(ignore_path, 'rb')
 
85
        try:
86
86
            entries = ignores.parse_ignore_file(f)
 
87
        finally:
 
88
            f.close()
87
89
        self.assertEqual(set(ignores.USER_DEFAULTS), entries)
88
90
 
89
 
    def test_create_with_intermediate_missing(self):
90
 
        # $HOME should be set to '.'
91
 
        ignore_path = bedding.user_ignore_config_path()
92
 
        self.assertPathDoesNotExist(ignore_path)
93
 
        os.mkdir('empty-home')
94
 
 
95
 
        config_path = os.path.join(self.test_dir, 'empty-home', '.config')
96
 
        self.overrideEnv('BRZ_HOME', config_path)
97
 
        self.assertPathDoesNotExist(config_path)
98
 
 
99
 
        user_ignores = ignores.get_user_ignores()
100
 
        self.assertEqual(set(ignores.USER_DEFAULTS), user_ignores)
101
 
 
102
 
        ignore_path = bedding.user_ignore_config_path()
103
 
        self.assertPathDoesNotExist(ignore_path)
104
 
 
105
91
    def test_use_existing(self):
106
 
        patterns = [u'*.o', u'*.py[co]', u'\xe5*']
 
92
        patterns = ['*.o', '*.py[co]', u'\xe5*']
107
93
        ignores._set_user_ignores(patterns)
108
94
 
109
95
        user_ignores = ignores.get_user_ignores()
111
97
 
112
98
    def test_use_empty(self):
113
99
        ignores._set_user_ignores([])
114
 
        ignore_path = bedding.user_ignore_config_path()
115
 
        self.check_file_contents(ignore_path, b'')
 
100
        ignore_path = config.user_ignore_config_filename()
 
101
        self.check_file_contents(ignore_path, '')
116
102
 
117
103
        self.assertEqual(set([]), ignores.get_user_ignores())
118
104
 
143
129
 
144
130
        in_patterns = ['foo/', 'bar/', 'baz\\']
145
131
        added = ignores.add_unique_user_ignores(in_patterns)
146
 
        out_patterns = [x.rstrip('/\\') for x in in_patterns]
 
132
        out_patterns = [ x.rstrip('/\\') for x in in_patterns ]
147
133
        self.assertEqual(out_patterns, added)
148
134
        self.assertEqual(set(out_patterns), ignores.get_user_ignores())
149
135
 
155
141
        added = ignores.add_unique_user_ignores(
156
142
            ['xxx', './bar', 'xxx', 'dir1/', 'dir2/', 'dir3\\'])
157
143
        self.assertEqual(['xxx', 'dir2'], added)
158
 
        self.assertEqual({'foo', './bar', u'b\xe5z',
159
 
                          'xxx', 'dir1', 'dir2', 'dir3'},
 
144
        self.assertEqual(set(['foo', './bar', u'b\xe5z',
 
145
                              'xxx', 'dir1', 'dir2', 'dir3']),
160
146
                         ignores.get_user_ignores())
161
147
 
162
148
 
174
160
        self.assertEqual(set(), ignores.get_runtime_ignores())
175
161
 
176
162
        ignores.add_runtime_ignores(['foo'])
177
 
        self.assertEqual({'foo'}, ignores.get_runtime_ignores())
 
163
        self.assertEqual(set(['foo']), ignores.get_runtime_ignores())
178
164
 
179
165
    def test_add_duplicate(self):
180
166
        """Adding the same ignore twice shouldn't add a new entry."""
181
167
        ignores.add_runtime_ignores(['foo', 'bar'])
182
 
        self.assertEqual({'foo', 'bar'}, ignores.get_runtime_ignores())
 
168
        self.assertEqual(set(['foo', 'bar']), ignores.get_runtime_ignores())
183
169
 
184
170
        ignores.add_runtime_ignores(['bar'])
185
 
        self.assertEqual({'foo', 'bar'}, ignores.get_runtime_ignores())
 
171
        self.assertEqual(set(['foo', 'bar']), ignores.get_runtime_ignores())
186
172
 
187
173
 
188
174
class TestTreeIgnores(TestCaseWithTransport):
189
 
 
 
175
    
190
176
    def assertPatternsEquals(self, patterns):
191
 
        with open(".bzrignore", "rb") as f:
192
 
            contents = f.read().decode("utf-8").splitlines()
 
177
        contents = open(".bzrignore", 'rU').read().strip().split('\n')
193
178
        self.assertEqual(sorted(patterns), sorted(contents))
194
179
 
195
180
    def test_new_file(self):
196
181
        tree = self.make_branch_and_tree(".")
197
 
        ignores.tree_ignores_add_patterns(tree, [u"myentry"])
 
182
        ignores.tree_ignores_add_patterns(tree, ["myentry"])
198
183
        self.assertTrue(tree.has_filename(".bzrignore"))
199
184
        self.assertPatternsEquals(["myentry"])
200
185
 
201
186
    def test_add_to_existing(self):
202
187
        tree = self.make_branch_and_tree(".")
203
 
        self.build_tree_contents([('.bzrignore', b"myentry1\n")])
 
188
        self.build_tree_contents([('.bzrignore', "myentry1\n")])
204
189
        tree.add([".bzrignore"])
205
 
        ignores.tree_ignores_add_patterns(tree, [u"myentry2", u"foo"])
 
190
        ignores.tree_ignores_add_patterns(tree, ["myentry2", "foo"])
206
191
        self.assertPatternsEquals(["myentry1", "myentry2", "foo"])
207
192
 
208
193
    def test_adds_ending_newline(self):
209
194
        tree = self.make_branch_and_tree(".")
210
 
        self.build_tree_contents([('.bzrignore', b"myentry1")])
 
195
        self.build_tree_contents([('.bzrignore', "myentry1")])
211
196
        tree.add([".bzrignore"])
212
 
        ignores.tree_ignores_add_patterns(tree, [u"myentry2"])
 
197
        ignores.tree_ignores_add_patterns(tree, ["myentry2"])
213
198
        self.assertPatternsEquals(["myentry1", "myentry2"])
214
 
        with open(".bzrignore") as f:
215
 
            text = f.read()
216
 
        self.assertTrue(text.endswith(('\r\n', '\n', '\r')))
 
199
        text = open(".bzrignore", 'r').read()
 
200
        self.assertTrue(text.endswith('\r\n') or
 
201
                        text.endswith('\n') or
 
202
                        text.endswith('\r'))
217
203
 
218
204
    def test_does_not_add_dupe(self):
219
205
        tree = self.make_branch_and_tree(".")
220
 
        self.build_tree_contents([('.bzrignore', b"myentry\n")])
 
206
        self.build_tree_contents([('.bzrignore', "myentry\n")])
221
207
        tree.add([".bzrignore"])
222
 
        ignores.tree_ignores_add_patterns(tree, [u"myentry"])
 
208
        ignores.tree_ignores_add_patterns(tree, ["myentry"])
223
209
        self.assertPatternsEquals(["myentry"])
224
210
 
225
211
    def test_non_ascii(self):
228
214
                                   u"myentry\u1234\n".encode('utf-8'))])
229
215
        tree.add([".bzrignore"])
230
216
        ignores.tree_ignores_add_patterns(tree, [u"myentry\u5678"])
231
 
        self.assertPatternsEquals([u"myentry\u1234", u"myentry\u5678"])
 
217
        self.assertPatternsEquals([u"myentry\u1234".encode('utf-8'),
 
218
                                   u"myentry\u5678".encode('utf-8')])
232
219
 
233
220
    def test_crlf(self):
234
221
        tree = self.make_branch_and_tree(".")
235
 
        self.build_tree_contents([('.bzrignore', b"myentry1\r\n")])
 
222
        self.build_tree_contents([('.bzrignore', "myentry1\r\n")])
236
223
        tree.add([".bzrignore"])
237
224
        ignores.tree_ignores_add_patterns(tree, ["myentry2", "foo"])
238
 
        with open('.bzrignore', 'rb') as f:
239
 
            self.assertEqual(f.read(), b'myentry1\r\nmyentry2\r\nfoo\r\n')
 
225
        self.assertEqual(open('.bzrignore', 'rb').read(), 'myentry1\r\nmyentry2\r\nfoo\r\n')
240
226
        self.assertPatternsEquals(["myentry1", "myentry2", "foo"])