Rev 5165: (lifeless) Fix running selftest when paramiko is not installed. (Martin [gz]) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5165 [merge]
revision-id: pqm at pqm.ubuntu.com-20100419052704-s2a31e5qdj5spbx9
parent: pqm at pqm.ubuntu.com-20100419041053-7rxk1julcon2sbm9
parent: gzlist at googlemail.com-20100418085137-9psgkt1av9imyoia
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2010-04-19 06:27:04 +0100
message:
  (lifeless) Fix running selftest when paramiko is not installed. (Martin [gz])
modified:
  bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
  bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
=== modified file 'bzrlib/tests/blackbox/test_selftest.py'
--- a/bzrlib/tests/blackbox/test_selftest.py	2010-02-23 07:43:11 +0000
+++ b/bzrlib/tests/blackbox/test_selftest.py	2010-04-18 08:51:37 +0000
@@ -22,7 +22,6 @@
     )
 from bzrlib.tests import (
     features,
-    stub_sftp,
     )
 from bzrlib.transport import memory
 
@@ -75,6 +74,7 @@
         # Test that we can pass a transport to the selftest core - sftp
         # version.
         self.requireFeature(features.paramiko)
+        from bzrlib.tests import stub_sftp
         params = self.get_params_passed_to_core('selftest --transport=sftp')
         self.assertEqual(stub_sftp.SFTPAbsoluteServer,
             params[1]["transport"])

=== modified file 'bzrlib/tests/test_selftest.py'
--- a/bzrlib/tests/test_selftest.py	2010-02-23 07:43:11 +0000
+++ b/bzrlib/tests/test_selftest.py	2010-04-18 08:51:37 +0000
@@ -62,7 +62,6 @@
     )
 from bzrlib.tests import (
     features,
-    stub_sftp,
     test_lsprof,
     test_server,
     test_sftp_transport,
@@ -1947,6 +1946,7 @@
 
     def test_transport_sftp(self):
         self.requireFeature(features.paramiko)
+        from bzrlib.tests import stub_sftp
         self.check_transport_set(stub_sftp.SFTPAbsoluteServer)
 
     def test_transport_memory(self):