/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_sftp_transport.py

  • Committer: John Arbash Meinel
  • Date: 2010-01-12 22:36:23 UTC
  • mfrom: (4953 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4955.
  • Revision ID: john@arbash-meinel.com-20100112223623-836x5mou0gm5vsep
merge bzr.dev 4953 to clean up the ui factory issues

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_sftp_transport.py
21
21
import threading
22
22
import time
23
23
 
24
 
try:
25
 
    import paramiko
26
 
    paramiko_loaded = True
27
 
except ImportError:
28
 
    paramiko_loaded = False
29
 
 
30
24
from bzrlib import (
31
25
    bzrdir,
32
26
    config,
41
35
    set_or_unset_env,
42
36
    )
43
37
from bzrlib.tests import (
 
38
    features,
44
39
    TestCaseWithTransport,
45
40
    TestCase,
46
41
    TestSkipped,
49
44
from bzrlib.transport import get_transport
50
45
import bzrlib.transport.http
51
46
 
52
 
if paramiko_loaded:
 
47
if features.paramiko.available():
53
48
    from bzrlib.transport import sftp as _mod_sftp
54
49
    from bzrlib.transport.sftp import (
55
50
        SFTPAbsoluteServer,
76
71
 
77
72
    def setUp(self):
78
73
        super(TestCaseWithSFTPServer, self).setUp()
79
 
        if not paramiko_loaded:
80
 
            raise TestSkipped('you must have paramiko to run this test')
 
74
        self.requireFeature(features.paramiko)
81
75
        set_test_transport_to_sftp(self)
82
76
 
83
77
 
165
159
class SFTPNonServerTest(TestCase):
166
160
    def setUp(self):
167
161
        TestCase.setUp(self)
168
 
        if not paramiko_loaded:
169
 
            raise TestSkipped('you must have paramiko to run this test')
 
162
        self.requireFeature(features.paramiko)
170
163
 
171
164
    def test_parse_url_with_home_dir(self):
172
165
        s = SFTPTransport('sftp://ro%62ey:h%40t@example.com:2222/~/relative')
199
192
    def test_abspath_root_sibling_server(self):
200
193
        from bzrlib.transport.sftp import SFTPSiblingAbsoluteServer
201
194
        server = SFTPSiblingAbsoluteServer()
202
 
        server.setUp()
 
195
        server.start_server()
203
196
        try:
204
197
            transport = get_transport(server.get_url())
205
198
            self.assertFalse(transport.abspath('/').endswith('/~/'))
206
199
            self.assertTrue(transport.abspath('/').endswith('/'))
207
200
            del transport
208
201
        finally:
209
 
            server.tearDown()
 
202
            server.stop_server()
210
203
 
211
204
 
212
205
class SFTPBranchTest(TestCaseWithSFTPServer):
307
300
    """
308
301
 
309
302
    def setUp(self):
310
 
        if not paramiko_loaded:
311
 
            raise TestSkipped('you must have paramiko to run this test')
 
303
        self.requireFeature(features.paramiko)
312
304
        super(SSHVendorBadConnection, self).setUp()
313
305
        import bzrlib.transport.ssh
314
306
 
420
412
 
421
413
    def setUp(self):
422
414
        TestCase.setUp(self)
423
 
        if not paramiko_loaded:
424
 
            raise TestSkipped('you must have paramiko to run this test')
 
415
        self.requireFeature(features.paramiko)
425
416
 
426
417
    def test_delay(self):
427
418
        from bzrlib.transport.sftp import SocketDelay
482
473
class Test_SFTPReadvHelper(tests.TestCase):
483
474
 
484
475
    def checkGetRequests(self, expected_requests, offsets):
485
 
        if not paramiko_loaded:
486
 
            raise TestSkipped('you must have paramiko to run this test')
 
476
        self.requireFeature(features.paramiko)
487
477
        helper = _mod_sftp._SFTPReadvHelper(offsets, 'artificial_test',
488
478
            _null_report_activity)
489
479
        self.assertEqual(expected_requests, helper._get_requests())
503
493
                               (42000, 24000)])
504
494
 
505
495
    def checkRequestAndYield(self, expected, data, offsets):
506
 
        if not paramiko_loaded:
507
 
            raise TestSkipped('you must have paramiko to run this test')
 
496
        self.requireFeature(features.paramiko)
508
497
        helper = _mod_sftp._SFTPReadvHelper(offsets, 'artificial_test',
509
498
            _null_report_activity)
510
499
        data_f = ReadvFile(data)