← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_ftp_transport.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:
bzrlib/tests/test_ftp_transport.py
32
32
    _test_needs_features = [ftp_server.FTPServerFeature]
33
33
 
34
34
    def setUp(self):
35
 
        self.transport_server = ftp_server.FTPServer
 
35
        self.transport_server = ftp_server.FTPTestServer
36
36
        super(TestCaseWithFTPServer, self).setUp()
37
37
 
38
38
 
48
48
        self.assertEqual('aftp://host/path', t.abspath(''))
49
49
 
50
50
 
51
 
class TestFTPServer(TestCaseWithFTPServer):
 
51
class TestFTPTestServer(TestCaseWithFTPServer):
52
52
 
53
53
    def test_basic_exists(self):
54
54
        url = self.get_url()
67
67
        self.assertEqual('test more bytes\n', t.get_bytes('foo'))
68
68
 
69
69
 
70
 
class TestFTPServerUI(TestCaseWithFTPServer):
 
70
class TestFTPTestServerUI(TestCaseWithFTPServer):
71
71
 
72
72
    def setUp(self):
73
 
        super(TestFTPServerUI, self).setUp()
 
73
        super(TestFTPTestServerUI, self).setUp()
74
74
        self.user = 'joe'
75
75
        self.password = 'secret'
76
76
        self.get_server().add_user(self.user, self.password)
77
77
 
78
78
    def get_url(self, relpath=None):
79
79
        """Overrides get_url to inject our user."""
80
 
        base = super(TestFTPServerUI, self).get_url(relpath)
 
80
        base = super(TestFTPTestServerUI, self).get_url(relpath)
81
81
        (scheme, user, password,
82
82
         host, port, path) = transport.ConnectedTransport._split_url(base)
83
83
        url = transport.ConnectedTransport._unsplit_url(