← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/sftp.py

More NEWS, move sibling sftp tests into new framework, nuke legacy local transport tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/sftp.py
888
888
    def __init__(self):
889
889
        self._original_vendor = None
890
890
        self._homedir = None
 
891
        self._server_homedir = None
891
892
        self._listener = None
892
893
        self._root = None
893
894
        # sftp server logs
906
907
        server = StubServer(self)
907
908
        ssh_server.set_subsystem_handler('sftp', paramiko.SFTPServer,
908
909
                                         StubSFTPServer, root=self._root,
909
 
                                         home=self._homedir)
 
910
                                         home=self._server_homedir)
910
911
        event = threading.Event()
911
912
        ssh_server.start_server(event, server)
912
913
        event.wait(5.0)
921
922
        self._original_vendor = _ssh_vendor
922
923
        _ssh_vendor = 'none'
923
924
        self._homedir = os.getcwdu()
 
925
        if self._server_homedir is None:
 
926
            self._server_homedir = self._homedir
924
927
        self._root = '/'
925
 
        # FIXME WINDOWS: _root should be _homedir[0]:/
 
928
        # FIXME WINDOWS: _root should be _server_homedir[0]:/
926
929
        self._listener = SingleListener(self._run_server)
927
930
        self._listener.setDaemon(True)
928
931
        self._listener.start()
949
952
    def get_url(self):
950
953
        """See bzrlib.transport.Server.get_url."""
951
954
        return self._get_sftp_url("")
 
955
 
 
956
 
 
957
class SFTPSiblingAbsoluteServer(SFTPAbsoluteServer):
 
958
    """A test servere for sftp transports, using absolute urls to non-home."""
 
959
 
 
960
    def setUp(self):
 
961
        self._server_homedir = '/dev/noone/runs/tests/here'
 
962
        super(SFTPSiblingAbsoluteServer, self).setUp()