← 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: Martin Pool
  • Date: 2010-04-21 11:27:04 UTC
  • mto: This revision was merged to the branch mainline in revision 5189.
  • Revision ID: mbp@canonical.com-20100421112704-zijso22b6pdevrxy
Simplify various code to use user_url

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_ignores.py
165
165
 
166
166
 
167
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))
172
168
 
173
169
    def test_new_file(self):
174
170
        tree = self.make_branch_and_tree(".")
175
171
        ignores.tree_ignores_add_patterns(tree, ["myentry"])
176
172
        self.assertTrue(tree.has_filename(".bzrignore"))
177
 
        self.assertPatternsEquals(["myentry"])
 
173
        self.assertEquals("myentry\n",
 
174
                          open(".bzrignore", 'r').read())
178
175
 
179
176
    def test_add_to_existing(self):
180
177
        tree = self.make_branch_and_tree(".")
181
178
        self.build_tree_contents([('.bzrignore', "myentry1\n")])
182
179
        tree.add([".bzrignore"])
183
180
        ignores.tree_ignores_add_patterns(tree, ["myentry2", "foo"])
184
 
        self.assertPatternsEquals(["myentry1", "myentry2", "foo"])
 
181
        self.assertEquals("myentry1\nmyentry2\nfoo\n",
 
182
                          open(".bzrignore", 'r').read())
185
183
 
186
184
    def test_adds_ending_newline(self):
187
185
        tree = self.make_branch_and_tree(".")
188
186
        self.build_tree_contents([('.bzrignore', "myentry1")])
189
187
        tree.add([".bzrignore"])
190
188
        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"])
 
189
        self.assertEquals("myentry1\nmyentry2\n",
 
190
                          open(".bzrignore", 'r').read())
 
191