/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/plugins/upload/tests/test_upload.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-05-11 10:32:40 UTC
  • mfrom: (6939.3.8 no-more-ftp)
  • Revision ID: breezy.the.bot@gmail.com-20180511103240-02ekq8vya562ensl
Drop support for FTP.

Merged from https://code.launchpad.net/~jelmer/brz/no-more-ftp/+merge/342526

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/upload/tests/test_upload.py
34
34
    per_branch,
35
35
    per_transport,
36
36
    )
37
 
from ....transport import (
38
 
    ftp,
39
 
    )
40
37
from .. import (
41
38
    cmds,
42
39
    )
46
43
    result = []
47
44
    basis = per_transport.transport_test_permutations()
48
45
    # Keep only the interesting ones for upload
49
 
    usable_classes = {ftp.FtpTransport}
 
46
    usable_classes = set()
50
47
    if features.paramiko.available():
51
48
        from ....transport import sftp
52
49
        usable_classes.add(sftp.SFTPTransport)
54
51
        t_class = d['transport_class']
55
52
        if t_class in usable_classes:
56
53
            result.append((name, d))
57
 
    try:
58
 
        import breezy.plugins.local_test_server
59
 
        from breezy.plugins.local_test_server import test_server
60
 
        if False:
61
 
            # XXX: Disable since we can't get chmod working for anonymous
62
 
            # user
63
 
            scenario = ('vsftpd',
64
 
                        {'transport_class': test_server.FtpTransport,
65
 
                         'transport_server': test_server.Vsftpd,
66
 
                         })
67
 
            result.append(scenario)
68
 
        from test_server import ProftpdFeature
69
 
        if ProftpdFeature().available():
70
 
            scenario = ('proftpd',
71
 
                        {'transport_class': test_server.FtpTransport,
72
 
                         'transport_server': test_server.Proftpd,
73
 
                         })
74
 
            result.append(scenario)
75
 
        # XXX: add support for pyftpdlib
76
 
    except ImportError:
77
 
        pass
78
54
    return result
79
55
 
80
56