← 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: Gary van der Merwe
  • Date: 2010-08-02 19:56:52 UTC
  • mfrom: (5050.3.18 2.2)
  • mto: (5050.3.19 2.2)
  • mto: This revision was merged to the branch mainline in revision 5371.
  • Revision ID: garyvdm@gmail.com-20100802195652-o1ppjemhwrr98i61
Merge lp:bzr/2.2.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_ignores.py
50
50
    def test_parse_empty(self):
51
51
        ignored = ignores.parse_ignore_file(StringIO(''))
52
52
        self.assertEqual(set([]), ignored)
 
53
        
 
54
    def test_parse_non_utf8(self):
 
55
        """Lines with non utf 8 characters should be discarded."""
 
56
        ignored = ignores.parse_ignore_file(StringIO(
 
57
                'utf8filename_a\n'
 
58
                'invalid utf8\x80\n'
 
59
                'utf8filename_b\n'
 
60
                ))
 
61
        self.assertEqual(set([
 
62
                        'utf8filename_a',
 
63
                        'utf8filename_b',
 
64
                       ]), ignored)
53
65
 
54
66
 
55
67
class TestUserIgnores(TestCaseInTempDir):
153
165
 
154
166
 
155
167
class TestTreeIgnores(TestCaseWithTransport):
 
168
    
 
169
    def assertPatternsEquals(self, patterns):
 
170
        contents = open(".bzrignore", 'rU').read().strip().split('\n')
 
171
        self.assertEquals(sorted(patterns), sorted(contents))
156
172
 
157
173
    def test_new_file(self):
158
174
        tree = self.make_branch_and_tree(".")
159
175
        ignores.tree_ignores_add_patterns(tree, ["myentry"])
160
176
        self.assertTrue(tree.has_filename(".bzrignore"))
161
 
        self.assertEquals("myentry\n",
162
 
                          open(".bzrignore", 'r').read())
 
177
        self.assertPatternsEquals(["myentry"])
163
178
 
164
179
    def test_add_to_existing(self):
165
180
        tree = self.make_branch_and_tree(".")
166
181
        self.build_tree_contents([('.bzrignore', "myentry1\n")])
167
182
        tree.add([".bzrignore"])
168
183
        ignores.tree_ignores_add_patterns(tree, ["myentry2", "foo"])
169
 
        self.assertEquals("myentry1\nmyentry2\nfoo\n",
170
 
                          open(".bzrignore", 'r').read())
 
184
        self.assertPatternsEquals(["myentry1", "myentry2", "foo"])
171
185
 
172
186
    def test_adds_ending_newline(self):
173
187
        tree = self.make_branch_and_tree(".")
174
188
        self.build_tree_contents([('.bzrignore', "myentry1")])
175
189
        tree.add([".bzrignore"])
176
190
        ignores.tree_ignores_add_patterns(tree, ["myentry2"])
177
 
        self.assertEquals("myentry1\nmyentry2\n",
178
 
                          open(".bzrignore", 'r').read())
179
 
 
 
191
        self.assertPatternsEquals(["myentry1", "myentry2"])
 
192
        text = open(".bzrignore", 'r').read()
 
193
        self.assertTrue(text.endswith('\r\n') or
 
194
                        text.endswith('\n') or
 
195
                        text.endswith('\r'))
 
196
 
 
197
    def test_does_not_add_dupe(self):
 
198
        tree = self.make_branch_and_tree(".")
 
199
        self.build_tree_contents([('.bzrignore', "myentry\n")])
 
200
        tree.add([".bzrignore"])
 
201
        ignores.tree_ignores_add_patterns(tree, ["myentry"])
 
202
        self.assertPatternsEquals(["myentry"])
 
203
 
 
204
    def test_non_ascii(self):
 
205
        tree = self.make_branch_and_tree(".")
 
206
        self.build_tree_contents([('.bzrignore',
 
207
                                   u"myentry\u1234\n".encode('utf-8'))])
 
208
        tree.add([".bzrignore"])
 
209
        ignores.tree_ignores_add_patterns(tree, [u"myentry\u5678"])
 
210
        self.assertPatternsEquals([u"myentry\u1234".encode('utf-8'),
 
211
                                   u"myentry\u5678".encode('utf-8')])
 
212
 
 
213
    def test_crlf(self):
 
214
        tree = self.make_branch_and_tree(".")
 
215
        self.build_tree_contents([('.bzrignore', "myentry1\r\n")])
 
216
        tree.add([".bzrignore"])
 
217
        ignores.tree_ignores_add_patterns(tree, ["myentry2", "foo"])
 
218
        self.assertEquals(open('.bzrignore', 'rb').read(), 'myentry1\r\nmyentry2\r\nfoo\r\n')
 
219
        self.assertPatternsEquals(["myentry1", "myentry2", "foo"])