Rev 4928: Change a lot of sftp tests over to using the paramiko feature in http://bazaar.launchpad.net/~jameinel/bzr/2.1.0rc1-module-available

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/2.1.0rc1-module-available

------------------------------------------------------------
revno: 4928
revision-id: john at arbash-meinel.com-20091221194946-vytf3v60rtzosyq2
parent: john at arbash-meinel.com-20091221194552-7a4j7nqnvaiyumvb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.1.0rc1-module-available
timestamp: Mon 2009-12-21 13:49:46 -0600
message:
  Change a lot of sftp tests over to using the paramiko feature
-------------- next part --------------
=== modified file 'bzrlib/tests/test_selftest.py'
--- a/bzrlib/tests/test_selftest.py	2009-12-08 21:46:07 +0000
+++ b/bzrlib/tests/test_selftest.py	2009-12-21 19:49:46 +0000
@@ -2020,10 +2020,7 @@
         self.assertEqual(transport_server, captured_transport[0])
 
     def test_transport_sftp(self):
-        try:
-            import bzrlib.transport.sftp
-        except errors.ParamikoNotPresent:
-            raise tests.TestSkipped("Paramiko not present")
+        self.requireFeature(tests.ParamikoFeature)
         self.check_transport_set(bzrlib.transport.sftp.SFTPAbsoluteServer)
 
     def test_transport_memory(self):

=== modified file 'bzrlib/tests/test_sftp_transport.py'
--- a/bzrlib/tests/test_sftp_transport.py	2009-04-27 16:10:10 +0000
+++ b/bzrlib/tests/test_sftp_transport.py	2009-12-21 19:49:46 +0000
@@ -21,12 +21,6 @@
 import threading
 import time
 
-try:
-    import paramiko
-    paramiko_loaded = True
-except ImportError:
-    paramiko_loaded = False
-
 from bzrlib import (
     bzrdir,
     config,
@@ -49,7 +43,7 @@
 from bzrlib.transport import get_transport
 import bzrlib.transport.http
 
-if paramiko_loaded:
+if tests.ParamikoFeature.available():
     from bzrlib.transport import sftp as _mod_sftp
     from bzrlib.transport.sftp import (
         SFTPAbsoluteServer,
@@ -76,8 +70,7 @@
 
     def setUp(self):
         super(TestCaseWithSFTPServer, self).setUp()
-        if not paramiko_loaded:
-            raise TestSkipped('you must have paramiko to run this test')
+        self.requireFeature(tests.ParamikoFeature)
         set_test_transport_to_sftp(self)
 
 
@@ -165,8 +158,7 @@
 class SFTPNonServerTest(TestCase):
     def setUp(self):
         TestCase.setUp(self)
-        if not paramiko_loaded:
-            raise TestSkipped('you must have paramiko to run this test')
+        self.requireFeature(tests.ParamikoFeature)
 
     def test_parse_url_with_home_dir(self):
         s = SFTPTransport('sftp://ro%62ey:h%40t@example.com:2222/~/relative')
@@ -307,8 +299,7 @@
     """
 
     def setUp(self):
-        if not paramiko_loaded:
-            raise TestSkipped('you must have paramiko to run this test')
+        self.requireFeature(tests.ParamikoFeature)
         super(SSHVendorBadConnection, self).setUp()
         import bzrlib.transport.ssh
 
@@ -420,8 +411,7 @@
 
     def setUp(self):
         TestCase.setUp(self)
-        if not paramiko_loaded:
-            raise TestSkipped('you must have paramiko to run this test')
+        self.requireFeature(tests.ParamikoFeature)
 
     def test_delay(self):
         from bzrlib.transport.sftp import SocketDelay
@@ -482,8 +472,7 @@
 class Test_SFTPReadvHelper(tests.TestCase):
 
     def checkGetRequests(self, expected_requests, offsets):
-        if not paramiko_loaded:
-            raise TestSkipped('you must have paramiko to run this test')
+        self.requireFeature(tests.ParamikoFeature)
         helper = _mod_sftp._SFTPReadvHelper(offsets, 'artificial_test',
             _null_report_activity)
         self.assertEqual(expected_requests, helper._get_requests())
@@ -503,8 +492,7 @@
                                (42000, 24000)])
 
     def checkRequestAndYield(self, expected, data, offsets):
-        if not paramiko_loaded:
-            raise TestSkipped('you must have paramiko to run this test')
+        self.requireFeature(tests.ParamikoFeature)
         helper = _mod_sftp._SFTPReadvHelper(offsets, 'artificial_test',
             _null_report_activity)
         data_f = ReadvFile(data)