/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 bzrlib/transport/ftp/_gssapi.py

  • Committer: Andrew Bennetts
  • Date: 2009-03-24 04:26:34 UTC
  • mfrom: (4190 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4194.
  • Revision ID: andrew.bennetts@canonical.com-20090324042634-cf4y15a5y24fw2n0
Merge bzr.dev, improve NEWS entry and bzrlib.smart.request docs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/ftp/_gssapi.py
150
150
 
151
151
def get_test_permutations():
152
152
    """Return the permutations to be used in testing."""
153
 
    from bzrlib import tests
154
 
    if tests.FTPServerFeature.available():
155
 
        from bzrlib.tests import ftp_server
156
 
        return [(GSSAPIFtpTransport, ftp_server.FTPServer)]
 
153
    from bzrlib.tests import ftp_server
 
154
    if ftp_server.FTPServerFeature.available():
 
155
        return [(GSSAPIFtpTransport, ftp_server.FTPTestServer)]
157
156
    else:
158
157
        return []