/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

Merge upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/ftp/_gssapi.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""Support for secure authentication using GSSAPI over FTP.
18
18
 
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 []