← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_ignores.py

  • Committer: Patch Queue Manager
  • Date: 2016-04-21 05:06:57 UTC
  • mfrom: (6603.4.1 bzr)
  • Revision ID: pqm@pqm.ubuntu.com-20160421050657-ygnzfybewvudf1j9
(richard-wilbur) Use initial_comment as commit_message for lp_propose.(Shawn
 Wang) (Shawn Wang)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_ignores.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006-2012, 2016 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
18
18
 
19
19
from cStringIO import StringIO
20
20
 
21
 
from bzrlib import config, errors, ignores
22
 
from bzrlib.tests import TestCase, TestCaseInTempDir, TestCaseWithTransport
 
21
from bzrlib import (
 
22
    config,
 
23
    ignores,
 
24
    )
 
25
from bzrlib.tests import (
 
26
    TestCase,
 
27
    TestCaseInTempDir,
 
28
    TestCaseWithTransport,
 
29
    )
23
30
 
24
31
 
25
32
class TestParseIgnoreFile(TestCase):
50
57
    def test_parse_empty(self):
51
58
        ignored = ignores.parse_ignore_file(StringIO(''))
52
59
        self.assertEqual(set([]), ignored)
 
60
        
 
61
    def test_parse_non_utf8(self):
 
62
        """Lines with non utf 8 characters should be discarded."""
 
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)
53
72
 
54
73
 
55
74
class TestUserIgnores(TestCaseInTempDir):
57
76
    def test_create_if_missing(self):
58
77
        # $HOME should be set to '.'
59
78
        ignore_path = config.user_ignore_config_filename()
60
 
        self.failIfExists(ignore_path)
 
79
        self.assertPathDoesNotExist(ignore_path)
61
80
        user_ignores = ignores.get_user_ignores()
62
81
        self.assertEqual(set(ignores.USER_DEFAULTS), user_ignores)
63
82
 
64
 
        self.failUnlessExists(ignore_path)
 
83
        self.assertPathExists(ignore_path)
65
84
        f = open(ignore_path, 'rb')
66
85
        try:
67
86
            entries = ignores.parse_ignore_file(f)
130
149
class TestRuntimeIgnores(TestCase):
131
150
 
132
151
    def setUp(self):
133
 
        TestCase.setUp(self)
 
152
        super(TestRuntimeIgnores, self).setUp()
134
153
 
135
154
        # For the purposes of these tests, we must have no
136
155
        # runtime ignores
153
172
 
154
173
 
155
174
class TestTreeIgnores(TestCaseWithTransport):
 
175
    
 
176
    def assertPatternsEquals(self, patterns):
 
177
        contents = open(".bzrignore", 'rU').read().strip().split('\n')
 
178
        self.assertEqual(sorted(patterns), sorted(contents))
156
179
 
157
180
    def test_new_file(self):
158
181
        tree = self.make_branch_and_tree(".")
159
182
        ignores.tree_ignores_add_patterns(tree, ["myentry"])
160
183
        self.assertTrue(tree.has_filename(".bzrignore"))
161
 
        self.assertEquals("myentry\n",
162
 
                          open(".bzrignore", 'r').read())
 
184
        self.assertPatternsEquals(["myentry"])
163
185
 
164
186
    def test_add_to_existing(self):
165
187
        tree = self.make_branch_and_tree(".")
166
188
        self.build_tree_contents([('.bzrignore', "myentry1\n")])
167
189
        tree.add([".bzrignore"])
168
190
        ignores.tree_ignores_add_patterns(tree, ["myentry2", "foo"])
169
 
        self.assertEquals("myentry1\nmyentry2\nfoo\n",
170
 
                          open(".bzrignore", 'r').read())
 
191
        self.assertPatternsEquals(["myentry1", "myentry2", "foo"])
171
192
 
172
193
    def test_adds_ending_newline(self):
173
194
        tree = self.make_branch_and_tree(".")
174
195
        self.build_tree_contents([('.bzrignore', "myentry1")])
175
196
        tree.add([".bzrignore"])
176
197
        ignores.tree_ignores_add_patterns(tree, ["myentry2"])
177
 
        self.assertEquals("myentry1\nmyentry2\n",
178
 
                          open(".bzrignore", 'r').read())
179
 
 
 
198
        self.assertPatternsEquals(["myentry1", "myentry2"])
 
199
        text = open(".bzrignore", 'r').read()
 
200
        self.assertTrue(text.endswith('\r\n') or
 
201
                        text.endswith('\n') or
 
202
                        text.endswith('\r'))
 
203
 
 
204
    def test_does_not_add_dupe(self):
 
205
        tree = self.make_branch_and_tree(".")
 
206
        self.build_tree_contents([('.bzrignore', "myentry\n")])
 
207
        tree.add([".bzrignore"])
 
208
        ignores.tree_ignores_add_patterns(tree, ["myentry"])
 
209
        self.assertPatternsEquals(["myentry"])
 
210
 
 
211
    def test_non_ascii(self):
 
212
        tree = self.make_branch_and_tree(".")
 
213
        self.build_tree_contents([('.bzrignore',
 
214
                                   u"myentry\u1234\n".encode('utf-8'))])
 
215
        tree.add([".bzrignore"])
 
216
        ignores.tree_ignores_add_patterns(tree, [u"myentry\u5678"])
 
217
        self.assertPatternsEquals([u"myentry\u1234".encode('utf-8'),
 
218
                                   u"myentry\u5678".encode('utf-8')])
 
219
 
 
220
    def test_crlf(self):
 
221
        tree = self.make_branch_and_tree(".")
 
222
        self.build_tree_contents([('.bzrignore', "myentry1\r\n")])
 
223
        tree.add([".bzrignore"])
 
224
        ignores.tree_ignores_add_patterns(tree, ["myentry2", "foo"])
 
225
        self.assertEqual(open('.bzrignore', 'rb').read(), 'myentry1\r\nmyentry2\r\nfoo\r\n')
 
226
        self.assertPatternsEquals(["myentry1", "myentry2", "foo"])