~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_ftp_transport.py

Prepare test framework for pyftpdlib injection.

* bzrlib/tests/ftp_server/__init__.py:
Provide a single front-end for ftp test servers.

* bzrlib/tests/test_ftp_transport.py: 
Use ftp_server import.

* bzrlib/transport/ftp/__init__.py:
(get_test_permutations): Simplified.

* bzrlib/tests/__init__.py:
(FTPServerFeature): Moved to bzrlib/tests/ftp_server/__init__.py.

Show diffs side-by-side

added added

removed removed

Lines of Context:
24
24
    ui,
25
25
    )
26
26
 
 
27
from bzrlib.tests import ftp_server
 
28
 
27
29
 
28
30
class TestCaseWithFTPServer(tests.TestCaseWithTransport):
29
31
 
30
 
    _test_needs_features = [tests.FTPServerFeature]
 
32
    _test_needs_features = [ftp_server.FTPServerFeature]
31
33
 
32
34
    def setUp(self):
33
 
        from bzrlib.tests import ftp_server
34
35
        self.transport_server = ftp_server.FTPServer
35
36
        super(TestCaseWithFTPServer, self).setUp()
36
37