← 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: 2009-10-02 20:32:50 UTC
  • mto: (4679.6.1 2.1-export-c-api)
  • mto: This revision was merged to the branch mainline in revision 4735.
  • Revision ID: john@arbash-meinel.com-20091002203250-q6iv6o2mwjqp4g53
Add __iter__ support.

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 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):
49
49
 
50
50
 
51
51
class TestUserIgnores(TestCaseInTempDir):
52
 
    
 
52
 
53
53
    def test_create_if_missing(self):
54
54
        # $HOME should be set to '.'
55
55
        ignore_path = config.user_ignore_config_filename()
99
99
        self.assertEqual(patterns, added)
100
100
        self.assertEqual(set(patterns), ignores.get_user_ignores())
101
101
 
 
102
    def test_add_directory(self):
 
103
        """Test that adding a directory will strip any trailing slash"""
 
104
        # Create an empty file
 
105
        ignores._set_user_ignores([])
 
106
 
 
107
        in_patterns = ['foo/', 'bar/', 'baz\\']
 
108
        added = ignores.add_unique_user_ignores(in_patterns)
 
109
        out_patterns = [ x.rstrip('/\\') for x in in_patterns ]
 
110
        self.assertEqual(out_patterns, added)
 
111
        self.assertEqual(set(out_patterns), ignores.get_user_ignores())
 
112
 
102
113
    def test_add_unique(self):
103
114
        """Test that adding will not duplicate ignores"""
104
 
        ignores._set_user_ignores(['foo', './bar', u'b\xe5z'])
 
115
        ignores._set_user_ignores(
 
116
            ['foo', './bar', u'b\xe5z', 'dir1/', 'dir3\\'])
105
117
 
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']),
 
118
        added = ignores.add_unique_user_ignores(
 
119
            ['xxx', './bar', 'xxx', 'dir1/', 'dir2/', 'dir3\\'])
 
120
        self.assertEqual(['xxx', 'dir2'], added)
 
121
        self.assertEqual(set(['foo', './bar', u'b\xe5z',
 
122
                              'xxx', 'dir1', 'dir2', 'dir3']),
109
123
                         ignores.get_user_ignores())
110
124
 
111
125
 
136
150
 
137
151
        ignores.add_runtime_ignores(['bar'])
138
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