← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/remote.py

Merge description into dont-add-conflict-helpers

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/remote.py
601
601
    """Return (transport, server) permutations for testing."""
602
602
    ### We may need a little more test framework support to construct an
603
603
    ### appropriate RemoteTransport in the future.
604
 
    from bzrlib.tests import test_server
605
 
    return [(RemoteTCPTransport, test_server.SmartTCPServer_for_testing)]
 
604
    from bzrlib.smart import server
 
605
    return [(RemoteTCPTransport, server.SmartTCPServer_for_testing)]