← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_ignores.py

(vila) Revise legal option names to be less drastic. (Vincent Ladeuil)

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-2011 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):
69
76
    def test_create_if_missing(self):
70
77
        # $HOME should be set to '.'
71
78
        ignore_path = config.user_ignore_config_filename()
72
 
        self.failIfExists(ignore_path)
 
79
        self.assertPathDoesNotExist(ignore_path)
73
80
        user_ignores = ignores.get_user_ignores()
74
81
        self.assertEqual(set(ignores.USER_DEFAULTS), user_ignores)
75
82
 
76
 
        self.failUnlessExists(ignore_path)
 
83
        self.assertPathExists(ignore_path)
77
84
        f = open(ignore_path, 'rb')
78
85
        try:
79
86
            entries = ignores.parse_ignore_file(f)
142
149
class TestRuntimeIgnores(TestCase):
143
150
 
144
151
    def setUp(self):
145
 
        TestCase.setUp(self)
 
152
        super(TestRuntimeIgnores, self).setUp()
146
153
 
147
154
        # For the purposes of these tests, we must have no
148
155
        # runtime ignores
165
172
 
166
173
 
167
174
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))
168
179
 
169
180
    def test_new_file(self):
170
181
        tree = self.make_branch_and_tree(".")
171
182
        ignores.tree_ignores_add_patterns(tree, ["myentry"])
172
183
        self.assertTrue(tree.has_filename(".bzrignore"))
173
 
        self.assertEquals("myentry\n",
174
 
                          open(".bzrignore", 'r').read())
 
184
        self.assertPatternsEquals(["myentry"])
175
185
 
176
186
    def test_add_to_existing(self):
177
187
        tree = self.make_branch_and_tree(".")
178
188
        self.build_tree_contents([('.bzrignore', "myentry1\n")])
179
189
        tree.add([".bzrignore"])
180
190
        ignores.tree_ignores_add_patterns(tree, ["myentry2", "foo"])
181
 
        self.assertEquals("myentry1\nmyentry2\nfoo\n",
182
 
                          open(".bzrignore", 'r').read())
 
191
        self.assertPatternsEquals(["myentry1", "myentry2", "foo"])
183
192
 
184
193
    def test_adds_ending_newline(self):
185
194
        tree = self.make_branch_and_tree(".")
186
195
        self.build_tree_contents([('.bzrignore', "myentry1")])
187
196
        tree.add([".bzrignore"])
188
197
        ignores.tree_ignores_add_patterns(tree, ["myentry2"])
189
 
        self.assertEquals("myentry1\nmyentry2\n",
190
 
                          open(".bzrignore", 'r').read())
191
 
 
 
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"])