~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_config.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:
1506
1506
 
1507
1507
    def test_username_default_no_prompt(self):
1508
1508
        conf = config.AuthenticationConfig()
1509
 
        self.assertEquals(getpass.getuser(), 
 
1509
        self.assertEquals(None,
1510
1510
            conf.get_user('ftp', 'example.com'))
1511
 
        self.assertEquals("explicitdefault", 
 
1511
        self.assertEquals("explicitdefault",
1512
1512
            conf.get_user('ftp', 'example.com', default="explicitdefault"))
1513
1513
 
1514
1514
    def test_password_default_prompts(self):
1524
1524
        # FIXME: should we: forbid that, extend it to other schemes, leave
1525
1525
        # things as they are that's fine thank you ?
1526
1526
        self._check_default_password_prompt('SMTP %(user)s@%(host)s password: ',
1527
 
                                   'smtp')
 
1527
                                            'smtp')
1528
1528
        self._check_default_password_prompt('SMTP %(user)s@%(host)s password: ',
1529
 
                                   'smtp', host='bar.org:10025')
 
1529
                                            'smtp', host='bar.org:10025')
1530
1530
        self._check_default_password_prompt(
1531
1531
            'SMTP %(user)s@%(host)s:%(port)d password: ',
1532
1532
            'smtp', port=10025)