/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_ignores.py

  • Committer: v.ladeuil+lp at free
  • Date: 2006-12-01 15:06:29 UTC
  • mto: (2172.3.1 bzr.73948)
  • mto: This revision was merged to the branch mainline in revision 2181.
  • Revision ID: v.ladeuil+lp@free.fr-20061201150629-zjd2an87u0r7nhhw
The tests that would have help avoid bug #73948 and all that mess :)

* bzrlib/transport/http/response.py:
(handle_response): Translate a 416 http error code into a bzr
exception.

* bzrlib/transport/http/_urllib2_wrappers.py:
(HTTPDefaultErrorHandler.http_error_default): Translate a 416 http
error code into a bzr exception.

* bzrlib/transport/http/_pycurl.py:
(PyCurlTransport._curl_perform): It could happen that pycrul
itself detect a short read.

* bzrlib/transport/http/__init__.py:
(HttpTransportBase._retry_get): New method, factorizing the retry
logic.
(HttpTransportBase.readv): We can have exception during the
initial GET worth degrading the range requirements (i.e. retrying
the GET request with either single or not ranges).

* bzrlib/tests/test_transport_implementations.py:
(TransportTests.test_readv_short_read): InvalidRange can also be
raised.

* bzrlib/tests/test_http.py:
(TestRangeRequestServer.test_readv_invalid_ranges): Was named
test_readv_short_read, the new name make the intent
clearer. Depending of the code path used (urllib or pycurl), both
exceptions can be raised.

* bzrlib/tests/HttpServer.py:
(TestingHTTPRequestHandler.do_GET): If invalid ranges are
specified, returns a 416 instead of the whole file (both are valid
according to the RFC).

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):
51
47
        ignored = ignores.parse_ignore_file(StringIO(''))
52
48
        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)
65
49
 
66
50
 
67
51
class TestUserIgnores(TestCaseInTempDir):
68
 
 
 
52
    
69
53
    def test_create_if_missing(self):
70
54
        # $HOME should be set to '.'
71
55
        ignore_path = config.user_ignore_config_filename()
120
104
        # Create an empty file
121
105
        ignores._set_user_ignores([])
122
106
 
123
 
        in_patterns = ['foo/', 'bar/', 'baz\\']
 
107
        in_patterns = ['foo/', 'bar/']
124
108
        added = ignores.add_unique_user_ignores(in_patterns)
125
 
        out_patterns = [ x.rstrip('/\\') for x in in_patterns ]
 
109
        out_patterns = [ x.rstrip('/') for x in in_patterns ]
126
110
        self.assertEqual(out_patterns, added)
127
111
        self.assertEqual(set(out_patterns), ignores.get_user_ignores())
128
112
 
129
113
    def test_add_unique(self):
130
114
        """Test that adding will not duplicate ignores"""
131
 
        ignores._set_user_ignores(
132
 
            ['foo', './bar', u'b\xe5z', 'dir1/', 'dir3\\'])
 
115
        ignores._set_user_ignores(['foo', './bar', u'b\xe5z', 'dir1/'])
133
116
 
134
117
        added = ignores.add_unique_user_ignores(
135
 
            ['xxx', './bar', 'xxx', 'dir1/', 'dir2/', 'dir3\\'])
 
118
            ['xxx', './bar', 'xxx', 'dir1/', 'dir2/'])
136
119
        self.assertEqual(['xxx', 'dir2'], added)
137
 
        self.assertEqual(set(['foo', './bar', u'b\xe5z',
138
 
                              'xxx', 'dir1', 'dir2', 'dir3']),
 
120
        self.assertEqual(set(['foo', './bar', u'b\xe5z', 
 
121
                              'xxx', 'dir1', 'dir2']),
139
122
                         ignores.get_user_ignores())
140
123
 
141
124
 
144
127
    def setUp(self):
145
128
        TestCase.setUp(self)
146
129
 
 
130
        orig = ignores._runtime_ignores
 
131
        def restore():
 
132
            ignores._runtime_ignores = orig
 
133
        self.addCleanup(restore)
147
134
        # For the purposes of these tests, we must have no
148
135
        # runtime ignores
149
 
        self.overrideAttr(ignores, '_runtime_ignores', set())
 
136
        ignores._runtime_ignores = set()
150
137
 
151
138
    def test_add(self):
152
139
        """Test that we can add an entry to the list."""
162
149
 
163
150
        ignores.add_runtime_ignores(['bar'])
164
151
        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