← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/transport_util.py

  • Committer: Robert Collins
  • Date: 2010-04-08 04:34:03 UTC
  • mfrom: (5138 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5139.
  • Revision ID: robertc@robertcollins.net-20100408043403-56z0d07vdqrx7f3t
Update bugfix for 528114 to trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/transport_util.py
100
100
    def setUp(self):
101
101
        register_urlparse_netloc_protocol(_hooked_scheme)
102
102
        register_transport(_hooked_scheme, ConnectionHookedTransport)
103
 
 
104
 
        def unregister():
105
 
            unregister_transport(_hooked_scheme, ConnectionHookedTransport)
106
 
            _unregister_urlparse_netloc_protocol(_hooked_scheme)
107
 
 
108
 
        self.addCleanup(unregister)
 
103
        self.addCleanup(unregister_transport, _hooked_scheme,
 
104
                        ConnectionHookedTransport)
 
105
        self.addCleanup(_unregister_urlparse_netloc_protocol, _hooked_scheme)
109
106
        super(TestCaseWithConnectionHookedTransport, self).setUp()
110
107
        self.reset_connections()
111
108
        # Add the 'hooked' url to the permitted url list.
128
125
        return url
129
126
 
130
127
    def start_logging_connections(self):
 
128
        self.overrideAttr(InstrumentedTransport, 'hooks', TransportHooks())
 
129
        # We preserved the hooks class attribute. Now we install our hook.
131
130
        ConnectionHookedTransport.hooks.install_named_hook(
132
131
            '_set_connection', self._collect_connection, None)
133
 
        # uninstall our hooks when we are finished
134
 
        self.addCleanup(self.reset_hooks)
135
 
 
136
 
    def reset_hooks(self):
137
 
        InstrumentedTransport.hooks = TransportHooks()
138
132
 
139
133
    def reset_connections(self):
140
134
        self.connections = []