/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 tests/test_upload.py

Plug tests against proftpd if the local_test_sever plugin is
installed and the server launched.

* tests/test_upload.py:
(TransportAdapter._test_permutations): Add profptd tests if
available.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_upload.py
67
67
                # Continue even if a dependency prevents us 
68
68
                # from adding this test
69
69
                pass
 
70
        try:
 
71
            import bzrlib.plugins.local_test_server
 
72
            from bzrlib.plugins.local_test_server import test_server
 
73
            if False:
 
74
                # XXX: Disable since we can't get chmod working for anonymous
 
75
                # user
 
76
                scenario = ('vsftpd',
 
77
                            {'transport_class': test_server.FtpTransport,
 
78
                             'transport_server': test_server.Vsftpd,
 
79
                             })
 
80
                result.append(scenario)
 
81
            if test_server.ProftpdFeature().available():
 
82
                scenario = ('proftpd',
 
83
                            {'transport_class': test_server.FtpTransport,
 
84
                             'transport_server': test_server.Proftpd,
 
85
                             })
 
86
                result.append(scenario)
 
87
        except ImportError:
 
88
            pass
70
89
        return result
71
90
 
72
91