~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transport_implementations.py

  • Committer: Vincent Ladeuil
  • Date: 2007-10-22 21:19:13 UTC
  • mto: (2961.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 2962.
  • Revision ID: v.ladeuil+lp@free.fr-20071022211913-119445k3qco40sx0
Make hhtp proxy aware of AuthenticationConfig (for password).

* bzrlib/transport/http/_urllib2_wrappers.py:
(Request.__init__): Update the auth dict content documentation.
(extract_credentials, extract_authentication_uri): Deleted.
(PasswordManager): Deleted.
(ProxyHandler.set_proxy): Query AuthenticationConfig for the
password. Simplified.
(AbstractAuthHandler): Looong forgotten feedback review about
_retry_count. The behaviour is not changed.
(AbstractAuthHandler.get_password): Change signature now that the
auth dict contains all relevant information. Simplified.
(DigestAuthHandler.auth_match): Delete gratuitous differences with
BasicAuthHandler.
(Opener.__init__): Get rid of PasswordManager.

* bzrlib/transport/http/_urllib.py:
(HttpTransport_urllib._perform): Replace authuri by its components
in the auth dict.

* bzrlib/transport/ftp.py: 
Register 'aftp' for urlparse (revealed by the host empty test in
_split_url).

* bzrlib/transport/__init__.py:
(ConnectedTransport._split_url): Check that host is not empty. Was
first needed to make a proxy test pass, but revealed more bugs in
the test suite.

* bzrlib/tests/test_transport_implementations.py:
(TransportTests.test__reuse_for): Fix bug revealed by the host
empty test in _split_url.

* bzrlib/tests/test_transport.py:
(TestConnectedTransport.test_connection_sharing_propagate_credentials): 
Fix bug revealed by the host empty test in _split_url.

* bzrlib/tests/test_smart_transport.py:
(HTTPTunnellingSmokeTest._test_bulk_data): Fix bug revealed by the
host empty test in _split_url.

* bzrlib/tests/test_http.py:
(TestHttpTransportUrls.test_invalid_http_urls): ConnectionError
can't be raised here.
(TestHttpProxyWhiteBox._proxied_request): No more PasswordManager,
yeah !
(TestProxyHttpServer): Delete FIXME, tests have been added a long
time ago.

* bzrlib/config.py:
(AuthenticationConfig.get_user): Fix silly copy/paste.
(AuthenticationConfig.get_password): Fix oversight.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1110
1110
 
1111
1111
        def new_url(scheme=None, user=None, password=None,
1112
1112
                    host=None, port=None, path=None):
1113
 
            """Build a new url from t.base chaging only parts of it.
 
1113
            """Build a new url from t.base changing only parts of it.
1114
1114
 
1115
1115
            Only the parameters different from None will be changed.
1116
1116
            """
1123
1123
            if path     is None: path     = t._path
1124
1124
            return t._unsplit_url(scheme, user, password, host, port, path)
1125
1125
 
1126
 
        self.assertIsNot(t, t._reuse_for(new_url(scheme='foo')))
 
1126
        if t._scheme == 'ftp':
 
1127
            scheme = 'sftp'
 
1128
        else:
 
1129
            scheme = 'ftp'
 
1130
        self.assertIsNot(t, t._reuse_for(new_url(scheme=scheme)))
1127
1131
        if t._user == 'me':
1128
1132
            user = 'you'
1129
1133
        else: