/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

Move register_ssh_vendor, _ssh_vendor and _get_ssh_vendor into ssh.py

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_sftp_transport.py
297
297
        if not paramiko_loaded:
298
298
            raise TestSkipped('you must have paramiko to run this test')
299
299
        super(SSHVendorBadConnection, self).setUp()
300
 
        import bzrlib.transport.sftp
301
 
 
302
 
        self._transport_sftp = bzrlib.transport.sftp
 
300
        import bzrlib.transport.ssh
303
301
 
304
302
        # open a random port, so we know nobody else is using it
305
303
        # but don't actually listen on the port.
307
305
        s.bind(('localhost', 0))
308
306
        self.bogus_url = 'sftp://%s:%s/' % s.getsockname()
309
307
 
310
 
        orig_vendor = bzrlib.transport.sftp._ssh_vendor
 
308
        orig_vendor = bzrlib.transport.ssh._ssh_vendor
311
309
        def reset():
312
 
            bzrlib.transport.sftp._ssh_vendor = orig_vendor
 
310
            bzrlib.transport.ssh._ssh_vendor = orig_vendor
313
311
            s.close()
314
312
        self.addCleanup(reset)
315
313
 
316
314
    def set_vendor(self, vendor):
317
 
        self._transport_sftp._ssh_vendor = vendor
 
315
        import bzrlib.transport.ssh
 
316
        bzrlib.transport.ssh._ssh_vendor = vendor
318
317
 
319
318
    def test_bad_connection_paramiko(self):
320
319
        """Test that a real connection attempt raises the right error"""