← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/__init__.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:
bzrlib/tests/__init__.py
3307
3307
    return None
3308
3308
 
3309
3309
 
3310
 
class _FTPServerFeature(Feature):
3311
 
    """Some tests want an FTP Server, check if one is available.
3312
 
 
3313
 
    Right now, the only way this is available is if 'medusa' is installed.
3314
 
    http://www.amk.ca/python/code/medusa.html
3315
 
    """
3316
 
 
3317
 
    def _probe(self):
3318
 
        try:
3319
 
            import bzrlib.tests.ftp_server
3320
 
            return True
3321
 
        except ImportError:
3322
 
            return False
3323
 
 
3324
 
    def feature_name(self):
3325
 
        return 'FTPServer'
3326
 
 
3327
 
 
3328
 
FTPServerFeature = _FTPServerFeature()
3329
 
 
3330
 
 
3331
3310
class _HTTPSServerFeature(Feature):
3332
3311
    """Some tests want an https Server, check if one is available.
3333
3312