/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/test_bzrdir.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2017-06-11 02:34:42 UTC
  • mfrom: (6681.2.10 more-controldir)
  • Revision ID: breezy.the.bot@gmail.com-20170611023442-p3vm7secrkqn6ckx
Some more bzrdir vs controldir fixes.

Merged from https://code.launchpad.net/~jelmer/brz/more-controldir/+merge/325453

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_bzrdir.py
885
885
        baz = self.make_branch('baz').controldir
886
886
        return foo, bar, baz
887
887
 
888
 
    def test_find_bzrdirs(self):
 
888
    def test_find_controldirs(self):
889
889
        foo, bar, baz = self.make_foo_bar_baz()
890
890
        t = self.get_transport()
891
 
        self.assertEqualBzrdirs([baz, foo, bar], bzrdir.BzrDir.find_bzrdirs(t))
 
891
        self.assertEqualBzrdirs([baz, foo, bar], bzrdir.BzrDir.find_controldirs(t))
892
892
 
893
893
    def make_fake_permission_denied_transport(self, transport, paths):
894
894
        """Create a transport that raises PermissionDenied for some paths."""
908
908
        for actual_bzrdir in actual_bzrdirs:
909
909
            self.assertEndsWith(actual_bzrdir.user_url, expect_url_suffix)
910
910
 
911
 
    def test_find_bzrdirs_permission_denied(self):
 
911
    def test_find_controldirs_permission_denied(self):
912
912
        foo, bar, baz = self.make_foo_bar_baz()
913
913
        t = self.get_transport()
914
914
        path_filter_server, path_filter_transport = \
915
915
            self.make_fake_permission_denied_transport(t, ['foo'])
916
916
        # local transport
917
917
        self.assertBranchUrlsEndWith('/baz/',
918
 
            bzrdir.BzrDir.find_bzrdirs(path_filter_transport))
 
918
            bzrdir.BzrDir.find_controldirs(path_filter_transport))
919
919
        # smart server
920
920
        smart_transport = self.make_smart_server('.',
921
921
            backing_server=path_filter_server)
922
922
        self.assertBranchUrlsEndWith('/baz/',
923
 
            bzrdir.BzrDir.find_bzrdirs(smart_transport))
 
923
            bzrdir.BzrDir.find_controldirs(smart_transport))
924
924
 
925
 
    def test_find_bzrdirs_list_current(self):
 
925
    def test_find_controldirs_list_current(self):
926
926
        def list_current(transport):
927
927
            return [s for s in transport.list_dir('') if s != 'baz']
928
928
 
930
930
        t = self.get_transport()
931
931
        self.assertEqualBzrdirs(
932
932
            [foo, bar],
933
 
            bzrdir.BzrDir.find_bzrdirs(t, list_current=list_current))
 
933
            bzrdir.BzrDir.find_controldirs(t, list_current=list_current))
934
934
 
935
 
    def test_find_bzrdirs_evaluate(self):
 
935
    def test_find_controldirs_evaluate(self):
936
936
        def evaluate(bzrdir):
937
937
            try:
938
938
                repo = bzrdir.open_repository()
944
944
        foo, bar, baz = self.make_foo_bar_baz()
945
945
        t = self.get_transport()
946
946
        self.assertEqual([baz.root_transport.base, foo.root_transport.base],
947
 
                         list(bzrdir.BzrDir.find_bzrdirs(t, evaluate=evaluate)))
 
947
                         list(bzrdir.BzrDir.find_controldirs(t, evaluate=evaluate)))
948
948
 
949
949
    def assertEqualBzrdirs(self, first, second):
950
950
        first = list(first)
971
971
 
972
972
class TestMissingRepoBranchesSkipped(TestCaseWithMemoryTransport):
973
973
 
974
 
    def test_find_bzrdirs_missing_repo(self):
 
974
    def test_find_controldirs_missing_repo(self):
975
975
        t = self.get_transport()
976
976
        arepo = self.make_repository('arepo', shared=True)
977
977
        abranch_url = arepo.user_url + '/abranch'