Rev 5400: Do it a different way by overriding the logging chosen in http://bazaar.launchpad.net/~jameinel/bzr/2.3-bzr-connect-ssh

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/2.3-bzr-connect-ssh

------------------------------------------------------------
revno: 5400
revision-id: john at arbash-meinel.com-20100901181828-w4hkbqanre70x10g
parent: john at arbash-meinel.com-20100901181627-rj2jl2vjkrt88ty9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.3-bzr-connect-ssh
timestamp: Wed 2010-09-01 13:18:28 -0500
message:
  Do it a different way by overriding the logging chosen
-------------- next part --------------
=== modified file 'bzrlib/tests/stub_sftp.py'
--- a/bzrlib/tests/stub_sftp.py	2010-09-01 18:09:14 +0000
+++ b/bzrlib/tests/stub_sftp.py	2010-09-01 18:18:28 +0000
@@ -345,6 +345,8 @@
         self.wrap_for_latency()
         tcs = self.server.test_case_server
         ssh_server = paramiko.Transport(self.request)
+        # Set it to a channel under 'bzr' so that we get debug info
+        ssh_server.set_log_channel('bzr.paramiko.transport')
         ssh_server.add_server_key(tcs.get_host_key())
         ssh_server.set_subsystem_handler('sftp', paramiko.SFTPServer,
                                          StubSFTPServer, root=tcs._root,

=== modified file 'bzrlib/tests/test_transport.py'
--- a/bzrlib/tests/test_transport.py	2010-09-01 18:16:27 +0000
+++ b/bzrlib/tests/test_transport.py	2010-09-01 18:18:28 +0000
@@ -16,7 +16,6 @@
 
 
 from cStringIO import StringIO
-import logging
 import os
 import subprocess
 import sys
@@ -911,13 +910,6 @@
         # override the interface (doesn't change self._vendor).
         # Note that this does encryption, so can be slow.
         from bzrlib.tests import stub_sftp
-        para_logger = logging.getLogger('paramiko')
-        orig_handlers = para_logger.handlers[:]
-        def restore():
-            para_logger.handlers[:] = orig_handlers
-        self.addCleanup(restore)
-        para_logger.handlers[:] = logging.getLogger('bzr').handlers[:]
-        para_logger.setLevel(logging.DEBUG)
 
         # Start an SSH server
         self.command_executed = []