← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bzrdir.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_bzrdir.py
286
286
        self.build_tree(["foo/", "bar/"], transport=t)
287
287
        def check_format(format, url):
288
288
            format.initialize(url)
289
 
            t = _mod_transport.get_transport(url)
 
289
            t = _mod_transport.get_transport_from_path(url)
290
290
            found_format = bzrdir.BzrDirFormat.find_format(t)
291
291
            self.assertIsInstance(found_format, format.__class__)
292
292
        check_format(BzrDirFormatTest1(), "foo")
295
295
    def test_find_format_nothing_there(self):
296
296
        self.assertRaises(NotBranchError,
297
297
                          bzrdir.BzrDirFormat.find_format,
298
 
                          _mod_transport.get_transport('.'))
 
298
                          _mod_transport.get_transport_from_path('.'))
299
299
 
300
300
    def test_find_format_unknown_format(self):
301
301
        t = self.get_transport()
303
303
        t.put_bytes('.bzr/branch-format', '')
304
304
        self.assertRaises(UnknownFormatError,
305
305
                          bzrdir.BzrDirFormat.find_format,
306
 
                          _mod_transport.get_transport('.'))
 
306
                          _mod_transport.get_transport_from_path('.'))
307
307
 
308
308
    def test_register_unregister_format(self):
309
309
        format = SampleBzrDirFormat()
317
317
        # which bzrdir.open_containing will refuse (not supported)
318
318
        self.assertRaises(UnsupportedFormatError, bzrdir.BzrDir.open_containing, url)
319
319
        # but open_downlevel will work
320
 
        t = _mod_transport.get_transport(url)
 
320
        t = _mod_transport.get_transport_from_url(url)
321
321
        self.assertEqual(format.open(t), bzrdir.BzrDir.open_unsupported(url))
322
322
        # unregister the format
323
323
        bzrdir.BzrProber.formats.remove(format.get_format_string())
711
711
    def test_open_containing_from_transport(self):
712
712
        self.assertRaises(NotBranchError,
713
713
            bzrdir.BzrDir.open_containing_from_transport,
714
 
            _mod_transport.get_transport(self.get_readonly_url('')))
 
714
            _mod_transport.get_transport_from_url(self.get_readonly_url('')))
715
715
        self.assertRaises(NotBranchError,
716
716
            bzrdir.BzrDir.open_containing_from_transport,
717
 
            _mod_transport.get_transport(self.get_readonly_url('g/p/q')))
 
717
            _mod_transport.get_transport_from_url(
 
718
                self.get_readonly_url('g/p/q')))
718
719
        control = bzrdir.BzrDir.create(self.get_url())
719
720
        branch, relpath = bzrdir.BzrDir.open_containing_from_transport(
720
 
            _mod_transport.get_transport(self.get_readonly_url('')))
 
721
            _mod_transport.get_transport_from_url(
 
722
                self.get_readonly_url('')))
721
723
        self.assertEqual('', relpath)
722
724
        branch, relpath = bzrdir.BzrDir.open_containing_from_transport(
723
 
            _mod_transport.get_transport(self.get_readonly_url('g/p/q')))
 
725
            _mod_transport.get_transport_from_url(
 
726
                self.get_readonly_url('g/p/q')))
724
727
        self.assertEqual('g/p/q', relpath)
725
728
 
726
729
    def test_open_containing_tree_or_branch(self):
899
902
        def evaluate(bzrdir):
900
903
            try:
901
904
                repo = bzrdir.open_repository()
902
 
            except NoRepositoryPresent:
 
905
            except errors.NoRepositoryPresent:
903
906
                return True, bzrdir.root_transport.base
904
907
            else:
905
908
                return False, bzrdir.root_transport.base