← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_server.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-08-20 22:42:34 UTC
  • mfrom: (6083.1.2 more-get-transport-from)
  • Revision ID: pqm@pqm.ubuntu.com-20110820224234-l0c0cmesdnfp2srq
(jelmer) Use get_transport_from_path and get_transport_from_url in more
 places. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_server.py
212
212
    def start_server(self, backing_server=None):
213
213
        """Setup the Chroot on backing_server."""
214
214
        if backing_server is not None:
215
 
            self.backing_transport = transport.get_transport(
 
215
            self.backing_transport = transport.get_transport_from_url(
216
216
                backing_server.get_url())
217
217
        else:
218
 
            self.backing_transport = transport.get_transport('.')
 
218
            self.backing_transport = transport.get_transport_from_path('.')
219
219
        self.backing_transport.clone('added-by-filter').ensure_base()
220
220
        self.filter_func = lambda x: 'added-by-filter/' + x
221
221
        super(TestingPathFilteringServer, self).start_server()
233
233
    def start_server(self, backing_server=None):
234
234
        """Setup the Chroot on backing_server."""
235
235
        if backing_server is not None:
236
 
            self.backing_transport = transport.get_transport(
 
236
            self.backing_transport = transport.get_transport_from_url(
237
237
                backing_server.get_url())
238
238
        else:
239
 
            self.backing_transport = transport.get_transport('.')
 
239
            self.backing_transport = transport.get_transport_from_path('.')
240
240
        super(TestingChrootServer, self).start_server()
241
241
 
242
242
    def get_bogus_url(self):
665
665
        self.chroot_server = ChrootServer(
666
666
            self.get_backing_transport(backing_transport_server))
667
667
        self.chroot_server.start_server()
668
 
        self.backing_transport = transport.get_transport(
 
668
        self.backing_transport = transport.get_transport_from_url(
669
669
            self.chroot_server.get_url())
670
670
        super(SmartTCPServer_for_testing, self).start_server()
671
671
 
677
677
 
678
678
    def get_backing_transport(self, backing_transport_server):
679
679
        """Get a backing transport from a server we are decorating."""
680
 
        return transport.get_transport(backing_transport_server.get_url())
 
680
        return transport.get_transport_from_url(
 
681
            backing_transport_server.get_url())
681
682
 
682
683
    def get_url(self):
683
684
        url = self.server.get_url()
694
695
    def get_backing_transport(self, backing_transport_server):
695
696
        """Get a backing transport from a server we are decorating."""
696
697
        url = 'readonly+' + backing_transport_server.get_url()
697
 
        return transport.get_transport(url)
 
698
        return transport.get_transport_from_url(url)
698
699
 
699
700
 
700
701
class SmartTCPServer_for_testing_v2_only(SmartTCPServer_for_testing):
715
716
    def get_backing_transport(self, backing_transport_server):
716
717
        """Get a backing transport from a server we are decorating."""
717
718
        url = 'readonly+' + backing_transport_server.get_url()
718
 
        return transport.get_transport(url)
 
719
        return transport.get_transport_from_url(url)