← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_sftp_transport.py

  • Committer: John Arbash Meinel
  • Date: 2010-09-25 20:08:01 UTC
  • mfrom: (5444 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5445.
  • Revision ID: john@arbash-meinel.com-20100925200801-7uf0ux3uwxo9i3x0
Merge bzr.dev 5444 to resolve some small text conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_sftp_transport.py
504
504
    """Test that AuthenticationConfig can supply default usernames."""
505
505
 
506
506
    def get_transport_for_connection(self, set_config):
507
 
        port = self.get_server()._listener.port
 
507
        port = self.get_server().port
508
508
        if set_config:
509
509
            conf = config.AuthenticationConfig()
510
510
            conf._get_config().update(