~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/sftp.py

  • Committer: Martin Pool
  • Date: 2010-01-07 03:03:01 UTC
  • mto: This revision was merged to the branch mainline in revision 4943.
  • Revision ID: mbp@sourcefrog.net-20100107030301-a8r5ur1qsp2vukx5
Rename Server.setUp to Server.start_server

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
1202
1202
    It does this by serving from a deeply-nested directory that doesn't exist.
1203
1203
    """
1204
1204
 
1205
 
    def setUp(self, backing_server=None):
 
1205
    def start_server(self, backing_server=None):
1206
1206
        self._server_homedir = '/dev/noone/runs/tests/here'
1207
 
        super(SFTPSiblingAbsoluteServer, self).setUp(backing_server)
 
1207
        super(SFTPSiblingAbsoluteServer, self).start_server(backing_server)
1208
1208
 
1209
1209
 
1210
1210
def get_test_permutations():