← 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: Canonical.com Patch Queue Manager
  • Date: 2007-10-31 10:40:53 UTC
  • mfrom: (2952.1.1 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20071031104053-fj7i7m8037qjgce4
Fix #157752 by wrapping medusa test ftp server behind FTPServerFeature

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_ftp_transport.py
23
23
    )
24
24
 
25
25
 
26
 
class _MedusaFeature(tests.Feature):
27
 
    """Some tests want an FTP Server, check if one is available.
28
 
 
29
 
    Right now, the only way this is available is if 'medusa' is installed.
30
 
    """
31
 
 
32
 
    def _probe(self):
33
 
        try:
34
 
            import medusa
35
 
            import medusa.filesys
36
 
            import medusa.ftp_server
37
 
            return True
38
 
        except ImportError:
39
 
            return False
40
 
 
41
 
    def feature_name(self):
42
 
        return 'medusa'
43
 
 
44
 
MedusaFeature = _MedusaFeature()
45
 
 
46
 
 
47
26
class TestCaseWithFTPServer(tests.TestCaseWithTransport):
48
27
 
49
 
    _test_needs_features = [MedusaFeature]
 
28
    _test_needs_features = [tests.FTPServerFeature]
50
29
 
51
30
    def setUp(self):
52
 
        from bzrlib.transport.ftp import FtpServer
53
 
        self.transport_server = FtpServer
 
31
        from bzrlib.tests import ftp_server
 
32
        self.transport_server = ftp_server.FTPServer
54
33
        super(TestCaseWithFTPServer, self).setUp()
55
34
 
56
35
 
57
 
 
58
36
class TestCaseAFTP(tests.TestCaseWithTransport):
59
37
    """Test aftp transport."""
60
38