← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_add.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/blackbox/test_add.py
1
 
# Copyright (C) 2006, 2007, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007 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
19
19
 
20
20
import os
21
21
 
22
 
from bzrlib import (
23
 
    osutils,
24
 
    tests,
25
 
    )
26
22
from bzrlib.tests import (
27
 
    script,
 
23
    condition_isinstance,
 
24
    split_suite_by_condition,
 
25
    multiply_tests,
28
26
    )
 
27
from bzrlib.tests.blackbox import ExternalBase
 
28
from bzrlib.tests.test_win32utils import NeedsGlobExpansionFeature
29
29
 
30
30
 
31
31
def load_tests(standard_tests, module, loader):
32
32
    """Parameterize tests for view-aware vs not."""
33
 
    to_adapt, result = tests.split_suite_by_condition(
34
 
        standard_tests, tests.condition_isinstance(TestAdd))
 
33
    to_adapt, result = split_suite_by_condition(
 
34
        standard_tests, condition_isinstance(TestAdd))
35
35
    scenarios = [
36
36
        ('pre-views', {'branch_tree_format': 'pack-0.92'}),
37
37
        ('view-aware', {'branch_tree_format': 'development6-rich-root'}),
38
38
        ]
39
 
    return tests.multiply_tests(to_adapt, scenarios, result)
40
 
 
41
 
 
42
 
class TestAdd(tests.TestCaseWithTransport):
 
39
    return multiply_tests(to_adapt, scenarios, result)
 
40
 
 
41
 
 
42
class TestAdd(ExternalBase):
43
43
 
44
44
    def make_branch_and_tree(self, dir):
45
 
        return super(TestAdd, self).make_branch_and_tree(
46
 
            dir, format=self.branch_tree_format)
 
45
        return ExternalBase.make_branch_and_tree(self, dir,
 
46
            format=self.branch_tree_format)
47
47
 
48
48
    def test_add_reports(self):
49
49
        """add command prints the names of added files."""
53
53
        out = self.run_bzr('add')[0]
54
54
        # the ordering is not defined at the moment
55
55
        results = sorted(out.rstrip('\n').split('\n'))
56
 
        self.assertEquals(['adding .bzrignore',
 
56
        self.assertEquals(['If you wish to add some of these files, please'\
 
57
                           ' add them by name.',
 
58
                           'adding .bzrignore',
57
59
                           'adding dir',
58
60
                           'adding dir/sub.txt',
59
 
                           'adding top.txt'],
 
61
                           'adding top.txt',
 
62
                           'ignored 1 file(s).'],
60
63
                          results)
61
64
        out = self.run_bzr('add -v')[0]
62
65
        results = sorted(out.rstrip('\n').split('\n'))
63
 
        self.assertEquals(['ignored CVS matching "CVS"'],
 
66
        self.assertEquals(['If you wish to add some of these files, please'\
 
67
                           ' add them by name.',
 
68
                           'ignored CVS matching "CVS"'],
64
69
                          results)
65
70
 
66
71
    def test_add_quiet_is(self):
114
119
 
115
120
        eq = self.assertEqual
116
121
        ass = self.assertTrue
 
122
        chdir = os.chdir
117
123
 
118
124
        t = self.make_branch_and_tree('.')
119
125
        b = t.branch
128
134
 
129
135
        # add with no arguments in a subdirectory gets only files below that
130
136
        # subdirectory
131
 
        self.run_bzr('add', working_dir='src')
132
 
        self.assertEquals('README\n',
133
 
                          self.run_bzr('unknowns', working_dir='src')[0])
 
137
        chdir('src')
 
138
        self.run_bzr('add')
 
139
        self.assertEquals(self.run_bzr('unknowns')[0], 'README\n')
134
140
        # reopen to see the new changes
135
 
        t = t.bzrdir.open_workingtree('src')
 
141
        t = t.bzrdir.open_workingtree()
136
142
        versioned = [path for path, entry in t.iter_entries_by_dir()]
137
 
        self.assertEquals(versioned, ['', 'src', 'src/foo.c'])
 
143
        self.assertEquals(versioned,
 
144
            ['', 'src', 'src/foo.c'])
138
145
 
139
146
        # add from the parent directory should pick up all file names
 
147
        chdir('..')
140
148
        self.run_bzr('add')
141
149
        self.assertEquals(self.run_bzr('unknowns')[0], '')
142
150
        self.run_bzr('check')
206
214
        err = self.run_bzr('add .bzr/crescent', retcode=3)[1]
207
215
        self.assertContainsRe(err, r'ERROR:.*\.bzr.*control file')
208
216
 
209
 
    def test_add_via_symlink(self):
210
 
        self.requireFeature(tests.SymlinkFeature)
211
 
        self.make_branch_and_tree('source')
212
 
        self.build_tree(['source/top.txt'])
213
 
        os.symlink('source', 'link')
214
 
        out = self.run_bzr(['add', 'link/top.txt'])[0]
215
 
        self.assertEquals(out, 'adding top.txt\n')
216
 
 
217
 
    def test_add_symlink_to_abspath(self):
218
 
        self.requireFeature(tests.SymlinkFeature)
219
 
        self.make_branch_and_tree('tree')
220
 
        os.symlink(osutils.abspath('target'), 'tree/link')
221
 
        out = self.run_bzr(['add', 'tree/link'])[0]
222
 
        self.assertEquals(out, 'adding link\n')
223
 
 
224
 
    def test_add_not_child(self):
225
 
        # https://bugs.launchpad.net/bzr/+bug/98735
226
 
        sr = script.ScriptRunner()
227
 
        self.make_branch_and_tree('tree1')
228
 
        self.make_branch_and_tree('tree2')
229
 
        self.build_tree(['tree1/a', 'tree2/b'])
230
 
        sr.run_script(self, '''
231
 
        $ bzr add tree1/a tree2/b
232
 
        2>bzr: ERROR: Path "...tree2/b" is not a child of path "...tree1"
233
 
        ''')
 
217
    def test_add_with_wildcards(self):
 
218
        self.requireFeature(NeedsGlobExpansionFeature)
 
219
        self.make_branch_and_tree('.')
 
220
        self.build_tree(['a1', 'a2', 'b', 'c33'])
 
221
        self.run_bzr(['add', 'a?', 'c*'])
 
222
        self.assertEquals(self.run_bzr('unknowns')[0], 'b\n')
 
223
 
 
224
    def test_add_with_wildcards_unicode(self):
 
225
        self.requireFeature(NeedsGlobExpansionFeature)
 
226
        self.make_branch_and_tree('.')
 
227
        self.build_tree([u'\u1234A', u'\u1235A', u'\u1235AA', 'cc'])
 
228
        self.run_bzr(['add', u'\u1234?', u'\u1235*'])
 
229
        self.assertEquals(self.run_bzr('unknowns')[0], 'cc\n')