← 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: 2017-01-17 13:48:10 UTC
  • mfrom: (6615.3.6 merges)
  • mto: This revision was merged to the branch mainline in revision 6620.
  • Revision ID: v.ladeuil+lp@free.fr-20170117134810-j9p3lidfy6pfyfsc
Merge 2.7, resolving conflicts

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.decorator import TransportDecorator, DecoratorServer
24
 
 
25
 
 
26
 
class TransportTraceDecorator(TransportDecorator):
 
23
from __future__ import absolute_import
 
24
 
 
25
from bzrlib.transport import decorator
 
26
 
 
27
 
 
28
class TransportTraceDecorator(decorator.TransportDecorator):
27
29
    """A tracing decorator for Transports.
28
30
 
29
31
    Calls that potentially perform IO are logged to self._activity. The
43
45
 
44
46
        _decorated is a private parameter for cloning.
45
47
        """
46
 
        TransportDecorator.__init__(self, url, _decorated)
 
48
        super(TransportTraceDecorator, self).__init__(url, _decorated)
47
49
        if _from_transport is None:
48
50
            # newly created
49
51
            self._activity = []
169
171
        self._activity.append(operation_tuple)
170
172
 
171
173
 
172
 
class TraceServer(DecoratorServer):
173
 
    """Server for the TransportTraceDecorator for testing with."""
174
 
 
175
 
    def get_decorator_class(self):
176
 
        return TransportTraceDecorator
177
 
 
178
 
 
179
174
def get_test_permutations():
180
175
    """Return the permutations to be used in testing."""
181
 
    return [(TransportTraceDecorator, TraceServer)]
 
176
    from bzrlib.tests import test_server
 
177
    return [(TransportTraceDecorator, test_server.TraceServer)]