← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_ignores.py

Merge the 0.17 fixes back into bzr.dev

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 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
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""Tests for handling of ignore files"""
18
18
 
19
19
from cStringIO import StringIO
20
20
 
21
21
from bzrlib import config, errors, ignores
22
 
from bzrlib.tests import TestCase, TestCaseInTempDir, TestCaseWithTransport
 
22
from bzrlib.tests import TestCase, TestCaseInTempDir
23
23
 
24
24
 
25
25
class TestParseIgnoreFile(TestCase):
34
34
                '\n' # empty line
35
35
                '#comment\n'
36
36
                ' xx \n' # whitespace
37
 
                '!RE:^\.z.*\n'
38
 
                '!!./.zcompdump\n'
39
37
                ))
40
38
        self.assertEqual(set(['./rootdir',
41
39
                          'randomfile*',
43
41
                          u'unicode\xb5',
44
42
                          'dos',
45
43
                          ' xx ',
46
 
                          '!RE:^\.z.*',
47
 
                          '!!./.zcompdump',
48
44
                         ]), ignored)
49
45
 
50
46
    def test_parse_empty(self):
53
49
 
54
50
 
55
51
class TestUserIgnores(TestCaseInTempDir):
56
 
 
 
52
    
57
53
    def test_create_if_missing(self):
58
54
        # $HOME should be set to '.'
59
55
        ignore_path = config.user_ignore_config_filename()
122
118
        added = ignores.add_unique_user_ignores(
123
119
            ['xxx', './bar', 'xxx', 'dir1/', 'dir2/', 'dir3\\'])
124
120
        self.assertEqual(['xxx', 'dir2'], added)
125
 
        self.assertEqual(set(['foo', './bar', u'b\xe5z',
 
121
        self.assertEqual(set(['foo', './bar', u'b\xe5z', 
126
122
                              'xxx', 'dir1', 'dir2', 'dir3']),
127
123
                         ignores.get_user_ignores())
128
124
 
132
128
    def setUp(self):
133
129
        TestCase.setUp(self)
134
130
 
 
131
        orig = ignores._runtime_ignores
 
132
        def restore():
 
133
            ignores._runtime_ignores = orig
 
134
        self.addCleanup(restore)
135
135
        # For the purposes of these tests, we must have no
136
136
        # runtime ignores
137
 
        self.overrideAttr(ignores, '_runtime_ignores', set())
 
137
        ignores._runtime_ignores = set()
138
138
 
139
139
    def test_add(self):
140
140
        """Test that we can add an entry to the list."""
150
150
 
151
151
        ignores.add_runtime_ignores(['bar'])
152
152
        self.assertEqual(set(['foo', 'bar']), ignores.get_runtime_ignores())
153
 
 
154
 
 
155
 
class TestTreeIgnores(TestCaseWithTransport):
156
 
 
157
 
    def test_new_file(self):
158
 
        tree = self.make_branch_and_tree(".")
159
 
        ignores.tree_ignores_add_patterns(tree, ["myentry"])
160
 
        self.assertTrue(tree.has_filename(".bzrignore"))
161
 
        self.assertEquals("myentry\n",
162
 
                          open(".bzrignore", 'r').read())
163
 
 
164
 
    def test_add_to_existing(self):
165
 
        tree = self.make_branch_and_tree(".")
166
 
        self.build_tree_contents([('.bzrignore', "myentry1\n")])
167
 
        tree.add([".bzrignore"])
168
 
        ignores.tree_ignores_add_patterns(tree, ["myentry2", "foo"])
169
 
        self.assertEquals("myentry1\nmyentry2\nfoo\n",
170
 
                          open(".bzrignore", 'r').read())
171
 
 
172
 
    def test_adds_ending_newline(self):
173
 
        tree = self.make_branch_and_tree(".")
174
 
        self.build_tree_contents([('.bzrignore', "myentry1")])
175
 
        tree.add([".bzrignore"])
176
 
        ignores.tree_ignores_add_patterns(tree, ["myentry2"])
177
 
        self.assertEquals("myentry1\nmyentry2\n",
178
 
                          open(".bzrignore", 'r').read())
179