~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transport_implementations.py

merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
38
38
from bzrlib.symbol_versioning import zero_eleven
39
39
from bzrlib.tests import TestCaseInTempDir, TestSkipped
40
40
from bzrlib.tests.test_transport import TestTransportImplementation
41
 
from bzrlib.transport import memory, smart
 
41
from bzrlib.smart import medium
 
42
from bzrlib.transport import memory, remote
42
43
import bzrlib.transport
43
44
 
44
45
 
45
46
class TransportTests(TestTransportImplementation):
46
47
 
 
48
    def setUp(self):
 
49
        super(TransportTests, self).setUp()
 
50
        self._captureVar('BZR_NO_SMART_VFS', None)
 
51
 
47
52
    def check_transport_contents(self, content, transport, relpath):
48
53
        """Check that transport.get(relpath).read() == content."""
49
54
        self.assertEqualDiff(content, transport.get(relpath).read())
1306
1311
        transport = self.get_transport()
1307
1312
        try:
1308
1313
            client_medium = transport.get_smart_medium()
1309
 
            self.assertIsInstance(client_medium, smart.SmartClientMedium)
 
1314
            self.assertIsInstance(client_medium, medium.SmartClientMedium)
1310
1315
        except errors.NoSmartMedium:
1311
1316
            # as long as we got it we're fine
1312
1317
            pass