← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_selftest.py

  • Committer: Andrew Bennetts
  • Date: 2010-07-28 07:05:19 UTC
  • mfrom: (5050.3.15 2.2)
  • mto: (5050.3.16 2.2)
  • mto: This revision was merged to the branch mainline in revision 5365.
  • Revision ID: andrew.bennetts@canonical.com-20100728070519-kkflohg6djas3ui4
Merge lp:bzr/2.2.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_selftest.py
622
622
    """Tests for the convenience functions TestCaseWithTransport introduces."""
623
623
 
624
624
    def test_get_readonly_url_none(self):
625
 
        from bzrlib.transport import get_transport
626
625
        from bzrlib.transport.readonly import ReadonlyTransportDecorator
627
626
        self.vfs_transport_factory = memory.MemoryServer
628
627
        self.transport_readonly_server = None
630
629
        # for the server
631
630
        url = self.get_readonly_url()
632
631
        url2 = self.get_readonly_url('foo/bar')
633
 
        t = get_transport(url)
634
 
        t2 = get_transport(url2)
 
632
        t = transport.get_transport(url)
 
633
        t2 = transport.get_transport(url2)
635
634
        self.failUnless(isinstance(t, ReadonlyTransportDecorator))
636
635
        self.failUnless(isinstance(t2, ReadonlyTransportDecorator))
637
636
        self.assertEqual(t2.base[:-1], t.abspath('foo/bar'))
638
637
 
639
638
    def test_get_readonly_url_http(self):
640
639
        from bzrlib.tests.http_server import HttpServer
641
 
        from bzrlib.transport import get_transport
642
640
        from bzrlib.transport.http import HttpTransportBase
643
641
        self.transport_server = test_server.LocalURLServer
644
642
        self.transport_readonly_server = HttpServer
646
644
        url = self.get_readonly_url()
647
645
        url2 = self.get_readonly_url('foo/bar')
648
646
        # the transport returned may be any HttpTransportBase subclass
649
 
        t = get_transport(url)
650
 
        t2 = get_transport(url2)
 
647
        t = transport.get_transport(url)
 
648
        t2 = transport.get_transport(url2)
651
649
        self.failUnless(isinstance(t, HttpTransportBase))
652
650
        self.failUnless(isinstance(t2, HttpTransportBase))
653
651
        self.assertEqual(t2.base[:-1], t.abspath('foo/bar'))
691
689
class TestChrootedTest(tests.ChrootedTestCase):
692
690
 
693
691
    def test_root_is_root(self):
694
 
        from bzrlib.transport import get_transport
695
 
        t = get_transport(self.get_readonly_url())
 
692
        t = transport.get_transport(self.get_readonly_url())
696
693
        url = t.base
697
694
        self.assertEqual(url, t.clone('..').base)
698
695