← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_smart_transport.py

  • Committer: Jelmer Vernooij
  • Date: 2011-08-19 22:34:02 UTC
  • mto: This revision was merged to the branch mainline in revision 6089.
  • Revision ID: jelmer@samba.org-20110819223402-wjywqb0fa1xxx522
Use get_transport_from_{url,path} in more places.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_smart_transport.py
1015
1015
            mem_server.start_server()
1016
1016
            self.addCleanup(mem_server.stop_server)
1017
1017
            self.permit_url(mem_server.get_url())
1018
 
            self.backing_transport = transport.get_transport(
 
1018
            self.backing_transport = transport.get_transport_from_url(
1019
1019
                mem_server.get_url())
1020
1020
        else:
1021
1021
            self.backing_transport = backing_transport
1022
1022
        if readonly:
1023
1023
            self.real_backing_transport = self.backing_transport
1024
 
            self.backing_transport = transport.get_transport(
 
1024
            self.backing_transport = transport.get_transport_from_url(
1025
1025
                "readonly+" + self.backing_transport.abspath('.'))
1026
1026
        self.server = server.SmartTCPServer(self.backing_transport)
1027
1027
        self.server.start_server('127.0.0.1', 0)
1179
1179
        self.hook_calls = []
1180
1180
        server.SmartTCPServer.hooks.install_named_hook('server_started',
1181
1181
            self.capture_server_call, None)
1182
 
        self.start_server(backing_transport=transport.get_transport("."))
 
1182
        self.start_server(
 
1183
            backing_transport=transport.get_transport_from_path("."))
1183
1184
        # at this point, the server will be starting a thread up.
1184
1185
        # there is no indicator at the moment, so bodge it by doing a request.
1185
1186
        self.transport.has('.')
1212
1213
        self.hook_calls = []
1213
1214
        server.SmartTCPServer.hooks.install_named_hook('server_stopped',
1214
1215
            self.capture_server_call, None)
1215
 
        self.start_server(backing_transport=transport.get_transport("."))
 
1216
        self.start_server(
 
1217
            backing_transport=transport.get_transport_from_path("."))
1216
1218
        result = [(
1217
1219
            [self.backing_transport.base, self.backing_transport.external_url()]
1218
1220
            , self.transport.base)]
1354
1356
class RemoteTransportRegistration(tests.TestCase):
1355
1357
 
1356
1358
    def test_registration(self):
1357
 
        t = transport.get_transport('bzr+ssh://example.com/path')
 
1359
        t = transport.get_transport_from_url('bzr+ssh://example.com/path')
1358
1360
        self.assertIsInstance(t, remote.RemoteSSHTransport)
1359
1361
        self.assertEqual('example.com', t._parsed_url.host)
1360
1362
 
1361
1363
    def test_bzr_https(self):
1362
1364
        # https://bugs.launchpad.net/bzr/+bug/128456
1363
 
        t = transport.get_transport('bzr+https://example.com/path')
 
1365
        t = transport.get_transport_from_url('bzr+https://example.com/path')
1364
1366
        self.assertIsInstance(t, remote.RemoteHTTPTransport)
1365
1367
        self.assertStartsWith(
1366
1368
            t._http_transport.base,