~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/http_utils.py

  • Committer: Jelmer Vernooij
  • Date: 2012-02-01 19:18:09 UTC
  • mfrom: (6459 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6460.
  • Revision ID: jelmer@samba.org-20120201191809-xn340a5i5v4fqsfu
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
51
51
 
52
52
    def do_POST(self):
53
53
        """Hand the request off to a smart server instance."""
54
 
        backing = transport.get_transport(
 
54
        backing = transport.get_transport_from_path(
55
55
            self.server.test_case_server._home_dir)
56
56
        chroot_server = chroot.ChrootServer(backing)
57
57
        chroot_server.start_server()
58
58
        try:
59
 
            t = transport.get_transport(chroot_server.get_url())
 
59
            t = transport.get_transport_from_url(chroot_server.get_url())
60
60
            self.do_POST_inner(t)
61
61
        finally:
62
62
            chroot_server.stop_server()
153
153
        return self._adjust_url(base, relpath)
154
154
 
155
155
    def get_secondary_transport(self, relpath=None):
156
 
        t = transport.get_transport(self.get_secondary_url(relpath))
 
156
        t = transport.get_transport_from_url(self.get_secondary_url(relpath))
157
157
        self.assertTrue(t.is_readonly())
158
158
        return t
159
159
 
257
257
        return self._adjust_url(base, relpath)
258
258
 
259
259
   def get_old_transport(self, relpath=None):
260
 
        t = transport.get_transport(self.get_old_url(relpath))
 
260
        t = transport.get_transport_from_url(self.get_old_url(relpath))
261
261
        self.assertTrue(t.is_readonly())
262
262
        return t
263
263
 
266
266
        return self._adjust_url(base, relpath)
267
267
 
268
268
   def get_new_transport(self, relpath=None):
269
 
        t = transport.get_transport(self.get_new_url(relpath))
 
269
        t = transport.get_transport_from_url(self.get_new_url(relpath))
270
270
        self.assertTrue(t.is_readonly())
271
271
        return t
272
272