← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_ftp_transport.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-08-09 12:34:00 UTC
  • mfrom: (6056.2.5 option-registry)
  • Revision ID: pqm@pqm.ubuntu.com-20110809123400-x521f2j9jkxx8ze2
(vila) Introduce OptionRegistry (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_ftp_transport.py
16
16
 
17
17
import ftplib
18
18
import getpass
19
 
import urllib
20
19
 
21
20
from bzrlib import (
22
21
    config,
82
81
    def get_url(self, relpath=None):
83
82
        """Overrides get_url to inject our user."""
84
83
        base = super(TestFTPTestServerUI, self).get_url(relpath)
85
 
        parsed_url = transport.ConnectedTransport._split_url(base)
86
 
        new_url = parsed_url.clone()
87
 
        new_url.user = self.user
88
 
        new_url.quoted_user = urllib.quote(self.user)
89
 
        new_url.password = self.password
90
 
        new_url.quoted_password = urllib.quote(self.password)
91
 
        return str(new_url)
 
84
        (scheme, user, password,
 
85
         host, port, path) = transport.ConnectedTransport._split_url(base)
 
86
        url = transport.ConnectedTransport._unsplit_url(
 
87
            scheme, self.user, self.password, host, port, path)
 
88
        return url
92
89
 
93
90
    def test_no_prompt_for_username(self):
94
91
        """ensure getpass.getuser() is used if there's no username in the