← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_sftp_transport.py

Move bzrlib.tests.ParamikoFeature to bzrlib.tests.features.paramiko

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_sftp_transport.py
35
35
    set_or_unset_env,
36
36
    )
37
37
from bzrlib.tests import (
 
38
    features,
38
39
    TestCaseWithTransport,
39
40
    TestCase,
40
41
    TestSkipped,
43
44
from bzrlib.transport import get_transport
44
45
import bzrlib.transport.http
45
46
 
46
 
if tests.ParamikoFeature.available():
 
47
if features.paramiko.available():
47
48
    from bzrlib.transport import sftp as _mod_sftp
48
49
    from bzrlib.transport.sftp import (
49
50
        SFTPAbsoluteServer,
70
71
 
71
72
    def setUp(self):
72
73
        super(TestCaseWithSFTPServer, self).setUp()
73
 
        self.requireFeature(tests.ParamikoFeature)
 
74
        self.requireFeature(features.paramiko)
74
75
        set_test_transport_to_sftp(self)
75
76
 
76
77
 
158
159
class SFTPNonServerTest(TestCase):
159
160
    def setUp(self):
160
161
        TestCase.setUp(self)
161
 
        self.requireFeature(tests.ParamikoFeature)
 
162
        self.requireFeature(features.paramiko)
162
163
 
163
164
    def test_parse_url_with_home_dir(self):
164
165
        s = SFTPTransport('sftp://ro%62ey:h%40t@example.com:2222/~/relative')
299
300
    """
300
301
 
301
302
    def setUp(self):
302
 
        self.requireFeature(tests.ParamikoFeature)
 
303
        self.requireFeature(features.paramiko)
303
304
        super(SSHVendorBadConnection, self).setUp()
304
305
        import bzrlib.transport.ssh
305
306
 
411
412
 
412
413
    def setUp(self):
413
414
        TestCase.setUp(self)
414
 
        self.requireFeature(tests.ParamikoFeature)
 
415
        self.requireFeature(features.paramiko)
415
416
 
416
417
    def test_delay(self):
417
418
        from bzrlib.transport.sftp import SocketDelay
472
473
class Test_SFTPReadvHelper(tests.TestCase):
473
474
 
474
475
    def checkGetRequests(self, expected_requests, offsets):
475
 
        self.requireFeature(tests.ParamikoFeature)
 
476
        self.requireFeature(features.paramiko)
476
477
        helper = _mod_sftp._SFTPReadvHelper(offsets, 'artificial_test',
477
478
            _null_report_activity)
478
479
        self.assertEqual(expected_requests, helper._get_requests())
492
493
                               (42000, 24000)])
493
494
 
494
495
    def checkRequestAndYield(self, expected, data, offsets):
495
 
        self.requireFeature(tests.ParamikoFeature)
 
496
        self.requireFeature(features.paramiko)
496
497
        helper = _mod_sftp._SFTPReadvHelper(offsets, 'artificial_test',
497
498
            _null_report_activity)
498
499
        data_f = ReadvFile(data)