← 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: Robert Collins
  • Date: 2010-05-06 07:48:22 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506074822-0bsgf2j4h8jx0xkk
Added ``bzrlib.tests.matchers`` as a place to put matchers, along with
our first in-tree matcher. See the module docstring for details.
(Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_ignores.py
1
 
# Copyright (C) 2006-2011 Canonical Ltd
 
1
# Copyright (C) 2006-2010 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 (
22
 
    config,
23
 
    ignores,
24
 
    )
25
 
from bzrlib.tests import (
26
 
    TestCase,
27
 
    TestCaseInTempDir,
28
 
    TestCaseWithTransport,
29
 
    )
 
21
from bzrlib import config, errors, ignores
 
22
from bzrlib.tests import TestCase, TestCaseInTempDir, TestCaseWithTransport
30
23
 
31
24
 
32
25
class TestParseIgnoreFile(TestCase):
172
165
 
173
166
 
174
167
class TestTreeIgnores(TestCaseWithTransport):
175
 
    
176
 
    def assertPatternsEquals(self, patterns):
177
 
        contents = open(".bzrignore", 'rU').read().strip().split('\n')
178
 
        self.assertEquals(sorted(patterns), sorted(contents))
179
168
 
180
169
    def test_new_file(self):
181
170
        tree = self.make_branch_and_tree(".")
182
171
        ignores.tree_ignores_add_patterns(tree, ["myentry"])
183
172
        self.assertTrue(tree.has_filename(".bzrignore"))
184
 
        self.assertPatternsEquals(["myentry"])
 
173
        self.assertEquals("myentry\n",
 
174
                          open(".bzrignore", 'r').read())
185
175
 
186
176
    def test_add_to_existing(self):
187
177
        tree = self.make_branch_and_tree(".")
188
178
        self.build_tree_contents([('.bzrignore', "myentry1\n")])
189
179
        tree.add([".bzrignore"])
190
180
        ignores.tree_ignores_add_patterns(tree, ["myentry2", "foo"])
191
 
        self.assertPatternsEquals(["myentry1", "myentry2", "foo"])
 
181
        self.assertEquals("myentry1\nmyentry2\nfoo\n",
 
182
                          open(".bzrignore", 'r').read())
192
183
 
193
184
    def test_adds_ending_newline(self):
194
185
        tree = self.make_branch_and_tree(".")
195
186
        self.build_tree_contents([('.bzrignore', "myentry1")])
196
187
        tree.add([".bzrignore"])
197
188
        ignores.tree_ignores_add_patterns(tree, ["myentry2"])
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.assertEquals(open('.bzrignore', 'rb').read(), 'myentry1\r\nmyentry2\r\nfoo\r\n')
226
 
        self.assertPatternsEquals(["myentry1", "myentry2", "foo"])
 
189
        self.assertEquals("myentry1\nmyentry2\n",
 
190
                          open(".bzrignore", 'r').read())
 
191