← 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-04-08 04:34:03 UTC
  • mfrom: (5138 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5139.
  • Revision ID: robertc@robertcollins.net-20100408043403-56z0d07vdqrx7f3t
Update bugfix for 528114 to trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_ignores.py
1
 
# Copyright (C) 2006 by 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
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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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
 
22
from bzrlib.tests import TestCase, TestCaseInTempDir, TestCaseWithTransport
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'
37
39
                ))
38
40
        self.assertEqual(set(['./rootdir',
39
41
                          'randomfile*',
41
43
                          u'unicode\xb5',
42
44
                          'dos',
43
45
                          ' xx ',
 
46
                          '!RE:^\.z.*',
 
47
                          '!!./.zcompdump',
44
48
                         ]), ignored)
45
49
 
46
50
    def test_parse_empty(self):
47
51
        ignored = ignores.parse_ignore_file(StringIO(''))
48
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)
49
65
 
50
66
 
51
67
class TestUserIgnores(TestCaseInTempDir):
52
 
    
 
68
 
53
69
    def test_create_if_missing(self):
54
70
        # $HOME should be set to '.'
55
71
        ignore_path = config.user_ignore_config_filename()
99
115
        self.assertEqual(patterns, added)
100
116
        self.assertEqual(set(patterns), ignores.get_user_ignores())
101
117
 
 
118
    def test_add_directory(self):
 
119
        """Test that adding a directory will strip any trailing slash"""
 
120
        # Create an empty file
 
121
        ignores._set_user_ignores([])
 
122
 
 
123
        in_patterns = ['foo/', 'bar/', 'baz\\']
 
124
        added = ignores.add_unique_user_ignores(in_patterns)
 
125
        out_patterns = [ x.rstrip('/\\') for x in in_patterns ]
 
126
        self.assertEqual(out_patterns, added)
 
127
        self.assertEqual(set(out_patterns), ignores.get_user_ignores())
 
128
 
102
129
    def test_add_unique(self):
103
130
        """Test that adding will not duplicate ignores"""
104
 
        ignores._set_user_ignores(['foo', './bar', u'b\xe5z'])
 
131
        ignores._set_user_ignores(
 
132
            ['foo', './bar', u'b\xe5z', 'dir1/', 'dir3\\'])
105
133
 
106
 
        added = ignores.add_unique_user_ignores(['xxx', './bar', 'xxx'])
107
 
        self.assertEqual(['xxx'], added)
108
 
        self.assertEqual(set(['foo', './bar', u'b\xe5z', 'xxx']),
 
134
        added = ignores.add_unique_user_ignores(
 
135
            ['xxx', './bar', 'xxx', 'dir1/', 'dir2/', 'dir3\\'])
 
136
        self.assertEqual(['xxx', 'dir2'], added)
 
137
        self.assertEqual(set(['foo', './bar', u'b\xe5z',
 
138
                              'xxx', 'dir1', 'dir2', 'dir3']),
109
139
                         ignores.get_user_ignores())
110
140
 
111
141
 
114
144
    def setUp(self):
115
145
        TestCase.setUp(self)
116
146
 
117
 
        orig = ignores._runtime_ignores
118
 
        def restore():
119
 
            ignores._runtime_ignores = orig
120
 
        self.addCleanup(restore)
121
147
        # For the purposes of these tests, we must have no
122
148
        # runtime ignores
123
 
        ignores._runtime_ignores = set()
 
149
        self.overrideAttr(ignores, '_runtime_ignores', set())
124
150
 
125
151
    def test_add(self):
126
152
        """Test that we can add an entry to the list."""
136
162
 
137
163
        ignores.add_runtime_ignores(['bar'])
138
164
        self.assertEqual(set(['foo', 'bar']), ignores.get_runtime_ignores())
 
165
 
 
166
 
 
167
class TestTreeIgnores(TestCaseWithTransport):
 
168
 
 
169
    def test_new_file(self):
 
170
        tree = self.make_branch_and_tree(".")
 
171
        ignores.tree_ignores_add_patterns(tree, ["myentry"])
 
172
        self.assertTrue(tree.has_filename(".bzrignore"))
 
173
        self.assertEquals("myentry\n",
 
174
                          open(".bzrignore", 'r').read())
 
175
 
 
176
    def test_add_to_existing(self):
 
177
        tree = self.make_branch_and_tree(".")
 
178
        self.build_tree_contents([('.bzrignore', "myentry1\n")])
 
179
        tree.add([".bzrignore"])
 
180
        ignores.tree_ignores_add_patterns(tree, ["myentry2", "foo"])
 
181
        self.assertEquals("myentry1\nmyentry2\nfoo\n",
 
182
                          open(".bzrignore", 'r').read())
 
183
 
 
184
    def test_adds_ending_newline(self):
 
185
        tree = self.make_branch_and_tree(".")
 
186
        self.build_tree_contents([('.bzrignore', "myentry1")])
 
187
        tree.add([".bzrignore"])
 
188
        ignores.tree_ignores_add_patterns(tree, ["myentry2"])
 
189
        self.assertEquals("myentry1\nmyentry2\n",
 
190
                          open(".bzrignore", 'r').read())
 
191