Rev 4170: (vila) Fix GSSAPIFtpTransport tests when no FTP test server is in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4170
revision-id: pqm at pqm.ubuntu.com-20090319192139-7y3mlqumxy7aqtdh
parent: pqm at pqm.ubuntu.com-20090319184152-fe9geb4odrs3jd3u
parent: v.ladeuil+lp at free.fr-20090319181702-h270jon932rss217
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2009-03-19 19:21:39 +0000
message:
  (vila) Fix GSSAPIFtpTransport tests when no FTP test server is
  	available
modified:
  bzrlib/transport/ftp/_gssapi.py _gssapi.py-20080611190840-7ejrtp884bk5eu72-2
    ------------------------------------------------------------
    revno: 4167.1.3
    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
    modified:
      bzrlib/transport/ftp/_gssapi.py _gssapi.py-20080611190840-7ejrtp884bk5eu72-2
=== 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 []