← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/sftp.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-11-17 03:20:35 UTC
  • mfrom: (4792.4.3 456036)
  • Revision ID: pqm@pqm.ubuntu.com-20091117032035-s3sgtlixj1lrminn
(Gordon Tyler) Fix IndexError during 'bzr ignore /' (#456036)

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 start_server(self, backing_server=None):
 
1081
    def setUp(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 stop_server(self):
 
1106
    def tearDown(self):
 
1107
        """See bzrlib.transport.Server.tearDown."""
1107
1108
        self._listener.stop()
1108
1109
        ssh._ssh_vendor_manager._cached_ssh_vendor = self._original_vendor
1109
1110
 
1202
1203
    It does this by serving from a deeply-nested directory that doesn't exist.
1203
1204
    """
1204
1205
 
1205
 
    def start_server(self, backing_server=None):
 
1206
    def setUp(self, backing_server=None):
1206
1207
        self._server_homedir = '/dev/noone/runs/tests/here'
1207
 
        super(SFTPSiblingAbsoluteServer, self).start_server(backing_server)
 
1208
        super(SFTPSiblingAbsoluteServer, self).setUp(backing_server)
1208
1209
 
1209
1210
 
1210
1211
def get_test_permutations():