~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/ftp_server/pyftpdlib_based.py

  • Committer: Vincent Ladeuil
  • Date: 2009-03-19 14:28:27 UTC
  • mto: (4167.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4168.
  • Revision ID: v.ladeuil+lp@free.fr-20090319142827-m03usu4my6qvukc8
Fix as per Martin's review.

* bzrlib/transport/ftp/_gssapi.py:
(get_test_permutations): Replace all occurences of FTPServer by
FTPTestServer to distinguish between the test front-end and the
real server.

* bzrlib/transport/ftp/__init__.py:
(get_test_permutations): Replace all occurences of FTPServer by
FTPTestServer.


* bzrlib/tests/test_ftp_transport.py:
Replace all occurences of FTPServer by FTPTestServer.

* bzrlib/tests/ftp_server/pyftpdlib_based.py:
Replace all occurences of FTPServer by FTPTestServer.
(BzrConformingFTPHandler): Fix odd capitalization.

* bzrlib/tests/ftp_server/medusa_based.py:
Replace all occurences of FTPServer by FTPTestServer.

* bzrlib/tests/ftp_server/__init__.py:
(_FTPServerFeature): Update docstring.
(FTPTestServer): Replace all occurences of FTPServer by
FTPTestServer.

Show diffs side-by-side

added added

removed removed

Lines of Context:
59
59
        return osutils.safe_utf8(p)
60
60
 
61
61
 
62
 
class BZRConformingFTPHandler(ftpserver.FTPHandler):
 
62
class BzrConformingFTPHandler(ftpserver.FTPHandler):
63
63
 
64
64
    abstracted_fs = BzrConformingFS
65
65
 
132
132
        self.addr = self.socket.getsockname()
133
133
 
134
134
 
135
 
class FTPServer(transport.Server):
 
135
class FTPTestServer(transport.Server):
136
136
    """Common code for FTP server facilities."""
137
137
 
138
138
    def __init__(self):
167
167
        address = ('localhost', 0) # bind to a random port
168
168
        authorizer = AnonymousWithWriteAccessAuthorizer()
169
169
        authorizer.add_anonymous(self._root, perm='elradfmw')
170
 
        self._ftp_server = ftp_server(address, BZRConformingFTPHandler,
 
170
        self._ftp_server = ftp_server(address, BzrConformingFTPHandler,
171
171
                                      authorizer)
172
172
        # This is hacky as hell, will not work if we need two servers working
173
173
        # at the same time, but that's the best we can do so far...