Rev 4170: Fix GSSAPIFtpTransport tests when no FTP test server is available in http://bazaar.launchpad.net/%7Evila/bzr/integration

[Vincent Ladeuil]

At http://bazaar.launchpad.net/%7Evila/bzr/integration

------------------------------------------------------------
revno: 4170
revision-id: v.ladeuil+lp at free.fr-20090319181702-h270jon932rss217
parent: v.ladeuil+lp at free.fr-20090319175118-zdi3fwmv3wzuktfu
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: integration
timestamp: Thu 2009-03-19 19:17:02 +0100
message:
  Fix GSSAPIFtpTransport tests when no FTP test server is available
-------------- next part --------------
=== modified file 'bzrlib/transport/ftp/_gssapi.py'
--- a/bzrlib/transport/ftp/_gssapi.py	2009-03-19 14:28:27 +0000
+++ b/bzrlib/transport/ftp/_gssapi.py	2009-03-19 18:17:02 +0000
@@ -150,9 +150,8 @@
 
 def get_test_permutations():
     """Return the permutations to be used in testing."""
-    from bzrlib import tests
-    if tests.FTPServerFeature.available():
-        from bzrlib.tests import ftp_server
+    from bzrlib.tests import ftp_server
+    if ftp_server.FTPServerFeature.available():
         return [(GSSAPIFtpTransport, ftp_server.FTPTestServer)]
     else:
         return []