← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transport_implementations.py

Merge from bzr.dev, resolving conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transport_implementations.py
36
36
                           TransportNotPossible, ConnectionError,
37
37
                           InvalidURL)
38
38
from bzrlib.osutils import getcwd
 
39
from bzrlib.smart import medium
39
40
from bzrlib.symbol_versioning import zero_eleven
40
41
from bzrlib.tests import TestCaseInTempDir, TestSkipped
41
42
from bzrlib.tests.test_transport import TestTransportImplementation
42
 
from bzrlib.transport import memory
43
 
from bzrlib.smart import medium
 
43
from bzrlib.transport import memory, remote
44
44
import bzrlib.transport
45
45
 
46
46