← 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: Vincent Ladeuil
  • Date: 2009-04-27 16:10:10 UTC
  • mto: (4310.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4311.
  • Revision ID: v.ladeuil+lp@free.fr-20090427161010-7swfzeagf63cpixd
Fix bug #367726 by reverting some default user handling introduced
while fixing bug #256612.

* bzrlib/transport/ssh.py:
(_paramiko_auth): Explicitly use getpass.getuser() as default
user.

* bzrlib/transport/ftp/_gssapi.py:
(GSSAPIFtpTransport._create_connection): Explicitly use
getpass.getuser() as default user.

* bzrlib/transport/ftp/__init__.py:
(FtpTransport._create_connection): Explicitly use
getpass.getuser() as default user.

* bzrlib/tests/test_sftp_transport.py:
(TestUsesAuthConfig.test_sftp_is_none_if_no_config)
(TestUsesAuthConfig.test_sftp_doesnt_prompt_username): Revert to
None as the default user.

* bzrlib/tests/test_remote.py:
(TestRemoteSSHTransportAuthentication): The really offending one:
revert to None as the default user.

* bzrlib/tests/test_config.py:
(TestAuthenticationConfig.test_username_default_no_prompt): Update
test (and some PEP8).

* bzrlib/smtp_connection.py:
(SMTPConnection._authenticate): Revert to None as the default
user.

* bzrlib/plugins/launchpad/account.py:
(_get_auth_user): Revert default value handling.

* bzrlib/config.py:
(AuthenticationConfig.get_user): Fix doc-string. Leave default
value handling to callers.

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
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):
144
128
    def setUp(self):
145
129
        TestCase.setUp(self)
146
130
 
 
131
        orig = ignores._runtime_ignores
 
132
        def restore():
 
133
            ignores._runtime_ignores = orig
 
134
        self.addCleanup(restore)
147
135
        # For the purposes of these tests, we must have no
148
136
        # runtime ignores
149
 
        self.overrideAttr(ignores, '_runtime_ignores', set())
 
137
        ignores._runtime_ignores = set()
150
138
 
151
139
    def test_add(self):
152
140
        """Test that we can add an entry to the list."""
165
153
 
166
154
 
167
155
class TestTreeIgnores(TestCaseWithTransport):
168
 
    
169
 
    def assertPatternsEquals(self, patterns):
170
 
        contents = open(".bzrignore", 'rU').read().strip().split('\n')
171
 
        self.assertEquals(sorted(patterns), sorted(contents))
172
156
 
173
157
    def test_new_file(self):
174
158
        tree = self.make_branch_and_tree(".")
175
159
        ignores.tree_ignores_add_patterns(tree, ["myentry"])
176
160
        self.assertTrue(tree.has_filename(".bzrignore"))
177
 
        self.assertPatternsEquals(["myentry"])
 
161
        self.assertEquals("myentry\n",
 
162
                          open(".bzrignore", 'r').read())
178
163
 
179
164
    def test_add_to_existing(self):
180
165
        tree = self.make_branch_and_tree(".")
181
166
        self.build_tree_contents([('.bzrignore', "myentry1\n")])
182
167
        tree.add([".bzrignore"])
183
168
        ignores.tree_ignores_add_patterns(tree, ["myentry2", "foo"])
184
 
        self.assertPatternsEquals(["myentry1", "myentry2", "foo"])
 
169
        self.assertEquals("myentry1\nmyentry2\nfoo\n",
 
170
                          open(".bzrignore", 'r').read())
185
171
 
186
172
    def test_adds_ending_newline(self):
187
173
        tree = self.make_branch_and_tree(".")
188
174
        self.build_tree_contents([('.bzrignore', "myentry1")])
189
175
        tree.add([".bzrignore"])
190
176
        ignores.tree_ignores_add_patterns(tree, ["myentry2"])
191
 
        self.assertPatternsEquals(["myentry1", "myentry2"])
192
 
        text = open(".bzrignore", 'r').read()
193
 
        self.assertTrue(text.endswith('\r\n') or
194
 
                        text.endswith('\n') or
195
 
                        text.endswith('\r'))
196
 
 
197
 
    def test_does_not_add_dupe(self):
198
 
        tree = self.make_branch_and_tree(".")
199
 
        self.build_tree_contents([('.bzrignore', "myentry\n")])
200
 
        tree.add([".bzrignore"])
201
 
        ignores.tree_ignores_add_patterns(tree, ["myentry"])
202
 
        self.assertPatternsEquals(["myentry"])
203
 
 
204
 
    def test_non_ascii(self):
205
 
        tree = self.make_branch_and_tree(".")
206
 
        self.build_tree_contents([('.bzrignore',
207
 
                                   u"myentry\u1234\n".encode('utf-8'))])
208
 
        tree.add([".bzrignore"])
209
 
        ignores.tree_ignores_add_patterns(tree, [u"myentry\u5678"])
210
 
        self.assertPatternsEquals([u"myentry\u1234".encode('utf-8'),
211
 
                                   u"myentry\u5678".encode('utf-8')])
212
 
 
213
 
    def test_crlf(self):
214
 
        tree = self.make_branch_and_tree(".")
215
 
        self.build_tree_contents([('.bzrignore', "myentry1\r\n")])
216
 
        tree.add([".bzrignore"])
217
 
        ignores.tree_ignores_add_patterns(tree, ["myentry2", "foo"])
218
 
        self.assertEquals(open('.bzrignore', 'rb').read(), 'myentry1\r\nmyentry2\r\nfoo\r\n')
219
 
        self.assertPatternsEquals(["myentry1", "myentry2", "foo"])
 
177
        self.assertEquals("myentry1\nmyentry2\n",
 
178
                          open(".bzrignore", 'r').read())
 
179