← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/trace.py

  • Committer: Vincent Ladeuil
  • Date: 2009-05-04 14:48:21 UTC
  • mto: (4349.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4350.
  • Revision ID: v.ladeuil+lp@free.fr-20090504144821-39dvqkikmd3zqkdg
Handle servers proposing several authentication schemes.

* bzrlib/transport/http/_urllib2_wrappers.py:
(AbstractAuthHandler.auth_required): Several schemes can be
proposed by the server, try to match each one in turn.
(BasicAuthHandler.auth_match): Delete dead code.

* bzrlib/tests/test_http.py:
(load_tests): Separate proxy and http authentication tests as they
require different server setups.
(TestAuth.create_transport_readonly_server): Simplified by using
parameter provided by load_tests.
(TestAuth.test_changing_nonce): Adapt to new parametrization.
(TestProxyAuth.create_transport_readonly_server): Deleted.

* bzrlib/tests/http_utils.py:
(DigestAndBasicAuthRequestHandler, HTTPBasicAndDigestAuthServer,
ProxyBasicAndDigestAuthServer): Add a test server proposing both
basic and digest auth schemes but accepting only digest as valid.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/trace.py
20
20
and then delegates it.
21
21
"""
22
22
 
23
 
from bzrlib.transport import decorator
24
 
 
25
 
 
26
 
class TransportTraceDecorator(decorator.TransportDecorator):
 
23
from bzrlib.transport.decorator import TransportDecorator, DecoratorServer
 
24
 
 
25
 
 
26
class TransportTraceDecorator(TransportDecorator):
27
27
    """A tracing decorator for Transports.
28
28
 
29
29
    Calls that potentially perform IO are logged to self._activity. The
33
33
    Not all operations are logged at this point, if you need an unlogged
34
34
    operation please add a test to the tests of this transport, for the logging
35
35
    of the operation you want logged.
36
 
 
37
 
    See also TransportLogDecorator, that records a machine-readable log in 
38
 
    memory for eg testing.
39
36
    """
40
37
 
41
38
    def __init__(self, url, _decorated=None, _from_transport=None):
43
40
 
44
41
        _decorated is a private parameter for cloning.
45
42
        """
46
 
        super(TransportTraceDecorator, self).__init__(url, _decorated)
 
43
        TransportDecorator.__init__(self, url, _decorated)
47
44
        if _from_transport is None:
48
45
            # newly created
49
46
            self._activity = []
129
126
 
130
127
    def readv(self, relpath, offsets, adjust_for_latency=False,
131
128
        upper_limit=None):
132
 
        # we override at the readv() level rather than _readv() so that any
133
 
        # latency adjustments will be done by the underlying transport
 
129
        """See Transport.readv."""
134
130
        self._trace(('readv', relpath, offsets, adjust_for_latency,
135
131
            upper_limit))
136
132
        return self._decorated.readv(relpath, offsets, adjust_for_latency,
169
165
        self._activity.append(operation_tuple)
170
166
 
171
167
 
 
168
class TraceServer(DecoratorServer):
 
169
    """Server for the TransportTraceDecorator for testing with."""
 
170
 
 
171
    def get_decorator_class(self):
 
172
        return TransportTraceDecorator
 
173
 
 
174
 
172
175
def get_test_permutations():
173
176
    """Return the permutations to be used in testing."""
174
 
    from bzrlib.tests import test_server
175
 
    return [(TransportTraceDecorator, test_server.TraceServer)]
 
177
    return [(TransportTraceDecorator, TraceServer)]