← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_commands.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_commands.py
23
23
    commands,
24
24
    config,
25
25
    errors,
 
26
    option,
26
27
    tests,
27
28
    )
28
29
from bzrlib.commands import display_command
60
61
        self.assertRaises(errors.BzrCommandError,
61
62
                          commands.run_bzr, ['log', u'--option\xb5'])
62
63
 
 
64
    @staticmethod
 
65
    def get_command(options):
 
66
        class cmd_foo(commands.Command):
 
67
            'Bar'
 
68
 
 
69
            takes_options = options
 
70
 
 
71
        return cmd_foo()
 
72
 
 
73
    def test_help_hidden(self):
 
74
        c = self.get_command([option.Option('foo', hidden=True)])
 
75
        self.assertNotContainsRe(c.get_help_text(), '--foo')
 
76
 
 
77
    def test_help_not_hidden(self):
 
78
        c = self.get_command([option.Option('foo', hidden=False)])
 
79
        self.assertContainsRe(c.get_help_text(), '--foo')
 
80
 
63
81
 
64
82
class TestGetAlias(tests.TestCase):
65
83