← 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: John Arbash Meinel
  • Date: 2010-02-17 17:11:16 UTC
  • mfrom: (4797.2.17 2.1)
  • mto: (4797.2.18 2.1)
  • mto: This revision was merged to the branch mainline in revision 5055.
  • Revision ID: john@arbash-meinel.com-20100217171116-h7t9223ystbnx5h8
merge bzr.2.1 in preparation for NEWS entry.

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)
65
53
 
66
54
 
67
55
class TestUserIgnores(TestCaseInTempDir):
144
132
    def setUp(self):
145
133
        TestCase.setUp(self)
146
134
 
 
135
        orig = ignores._runtime_ignores
 
136
        def restore():
 
137
            ignores._runtime_ignores = orig
 
138
        self.addCleanup(restore)
147
139
        # For the purposes of these tests, we must have no
148
140
        # runtime ignores
149
 
        self.overrideAttr(ignores, '_runtime_ignores', set())
 
141
        ignores._runtime_ignores = set()
150
142
 
151
143
    def test_add(self):
152
144
        """Test that we can add an entry to the list."""
165
157
 
166
158
 
167
159
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))
172
160
 
173
161
    def test_new_file(self):
174
162
        tree = self.make_branch_and_tree(".")
175
163
        ignores.tree_ignores_add_patterns(tree, ["myentry"])
176
164
        self.assertTrue(tree.has_filename(".bzrignore"))
177
 
        self.assertPatternsEquals(["myentry"])
 
165
        self.assertEquals("myentry\n",
 
166
                          open(".bzrignore", 'r').read())
178
167
 
179
168
    def test_add_to_existing(self):
180
169
        tree = self.make_branch_and_tree(".")
181
170
        self.build_tree_contents([('.bzrignore', "myentry1\n")])
182
171
        tree.add([".bzrignore"])
183
172
        ignores.tree_ignores_add_patterns(tree, ["myentry2", "foo"])
184
 
        self.assertPatternsEquals(["myentry1", "myentry2", "foo"])
 
173
        self.assertEquals("myentry1\nmyentry2\nfoo\n",
 
174
                          open(".bzrignore", 'r').read())
185
175
 
186
176
    def test_adds_ending_newline(self):
187
177
        tree = self.make_branch_and_tree(".")
188
178
        self.build_tree_contents([('.bzrignore', "myentry1")])
189
179
        tree.add([".bzrignore"])
190
180
        ignores.tree_ignores_add_patterns(tree, ["myentry2"])
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"])
 
181
        self.assertEquals("myentry1\nmyentry2\n",
 
182
                          open(".bzrignore", 'r').read())
 
183