← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/sftp.py

Merge description into dont-add-conflict-helpers

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/sftp.py
1078
1078
        ssh_server.start_server(event, server)
1079
1079
        event.wait(5.0)
1080
1080
 
1081
 
    def setUp(self, backing_server=None):
 
1081
    def start_server(self, backing_server=None):
1082
1082
        # XXX: TODO: make sftpserver back onto backing_server rather than local
1083
1083
        # disk.
1084
1084
        if not (backing_server is None or
1103
1103
        self._listener.setDaemon(True)
1104
1104
        self._listener.start()
1105
1105
 
1106
 
    def tearDown(self):
1107
 
        """See bzrlib.transport.Server.tearDown."""
 
1106
    def stop_server(self):
1108
1107
        self._listener.stop()
1109
1108
        ssh._ssh_vendor_manager._cached_ssh_vendor = self._original_vendor
1110
1109
 
1203
1202
    It does this by serving from a deeply-nested directory that doesn't exist.
1204
1203
    """
1205
1204
 
1206
 
    def setUp(self, backing_server=None):
 
1205
    def start_server(self, backing_server=None):
1207
1206
        self._server_homedir = '/dev/noone/runs/tests/here'
1208
 
        super(SFTPSiblingAbsoluteServer, self).setUp(backing_server)
 
1207
        super(SFTPSiblingAbsoluteServer, self).start_server(backing_server)
1209
1208
 
1210
1209
 
1211
1210
def get_test_permutations():