← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_controldir/test_controldir.py

  • Committer: Vincent Ladeuil
  • Date: 2011-01-27 14:27:18 UTC
  • mto: (5609.10.1 2.3b5-dev)
  • mto: This revision was merged to the branch mainline in revision 5635.
  • Revision ID: v.ladeuil+lp@free.fr-20110127142718-1ik7fyjfflgj91j5
Use self.get_transport instead of transport.get_transport where possible.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_controldir/test_controldir.py
804
804
            '_network_name', None),
805
805
            None)
806
806
        # supported formats must be able to init and open
807
 
        t = transport.get_transport(self.get_url())
808
 
        readonly_t = transport.get_transport(self.get_readonly_url())
 
807
        t = self.get_transport()
 
808
        readonly_t = self.get_readonly_transport()
809
809
        made_control = self.bzrdir_format.initialize(t.base)
810
810
        self.failUnless(isinstance(made_control, controldir.ControlDir))
811
811
        self.assertEqual(self.bzrdir_format,
1025
1025
            # because the default open will not open them and
1026
1026
            # they may not be initializable.
1027
1027
            return
1028
 
        t = transport.get_transport(self.get_url())
 
1028
        t = self.get_transport()
1029
1029
        made_control = self.bzrdir_format.initialize(t.base)
1030
1030
        made_repo = made_control.create_repository()
1031
1031
        made_branch = made_control.create_branch()
1038
1038
            # because the default open will not open them and
1039
1039
            # they may not be initializable.
1040
1040
            return
1041
 
        t = transport.get_transport(self.get_url())
 
1041
        t = self.get_transport()
1042
1042
        made_control = self.bzrdir_format.initialize(t.base)
1043
1043
        made_repo = made_control.create_repository()
1044
1044
        made_branch = made_control.create_branch()
1053
1053
            # because the default open will not open them and
1054
1054
            # they may not be initializable.
1055
1055
            return
1056
 
        t = transport.get_transport(self.get_url())
 
1056
        t = self.get_transport()
1057
1057
        made_control = self.bzrdir_format.initialize(t.base)
1058
1058
        made_repo = made_control.create_repository()
1059
1059
        made_branch = made_control.create_branch()
1074
1074
            # because the default open will not open them and
1075
1075
            # they may not be initializable.
1076
1076
            return
1077
 
        t = transport.get_transport(self.get_url())
 
1077
        t = self.get_transport()
1078
1078
        made_control = self.bzrdir_format.initialize(t.base)
1079
1079
        made_repo = made_control.create_repository()
1080
1080
        # Check that we have a repository object.
1089
1089
            # because the default open will not open them and
1090
1090
            # they may not be initializable.
1091
1091
            return
1092
 
        t = transport.get_transport(self.get_url())
 
1092
        t = self.get_transport()
1093
1093
        made_control = self.bzrdir_format.initialize(t.base)
1094
1094
        try:
1095
1095
            made_repo = made_control.create_repository(shared=True)
1106
1106
            # because the default open will not open them and
1107
1107
            # they may not be initializable.
1108
1108
            return
1109
 
        t = transport.get_transport(self.get_url())
 
1109
        t = self.get_transport()
1110
1110
        made_control = self.bzrdir_format.initialize(t.base)
1111
1111
        made_repo = made_control.create_repository(shared=False)
1112
1112
        self.assertFalse(made_repo.is_shared())
1117
1117
            # because the default open will not open them and
1118
1118
            # they may not be initializable.
1119
1119
            return
1120
 
        t = transport.get_transport(self.get_url())
 
1120
        t = self.get_transport()
1121
1121
        made_control = self.bzrdir_format.initialize(t.base)
1122
1122
        made_repo = made_control.create_repository()
1123
1123
        opened_repo = made_control.open_repository()
1245
1245
    def test_root_transport(self):
1246
1246
        dir = self.make_bzrdir('.')
1247
1247
        self.assertEqual(dir.root_transport.base,
1248
 
                         transport.get_transport(self.get_url('.')).base)
 
1248
                         self.get_transport().base)
1249
1249
 
1250
1250
    def test_find_repository_no_repo_under_standalone_branch(self):
1251
1251
        # finding a repo stops at standalone branches even if there is a
1256
1256
            # need a shared repository to test this.
1257
1257
            return
1258
1258
        url = self.get_url('intermediate')
1259
 
        transport.get_transport(self.get_url()).mkdir('intermediate')
1260
 
        transport.get_transport(self.get_url()).mkdir('intermediate/child')
 
1259
        t = self.get_transport()
 
1260
        t.mkdir('intermediate')
 
1261
        t.mkdir('intermediate/child')
1261
1262
        made_control = self.bzrdir_format.initialize(url)
1262
1263
        made_control.create_repository()
1263
1264
        innermost_control = self.bzrdir_format.initialize(
1281
1282
            # need a shared repository to test this.
1282
1283
            return
1283
1284
        url = self.get_url('childbzrdir')
1284
 
        transport.get_transport(self.get_url()).mkdir('childbzrdir')
 
1285
        self.get_transport().mkdir('childbzrdir')
1285
1286
        made_control = self.bzrdir_format.initialize(url)
1286
1287
        try:
1287
1288
            child_repo = made_control.open_repository()
1315
1316
            # need a shared repository to test this.
1316
1317
            return
1317
1318
        url = self.get_url('childrepo')
1318
 
        transport.get_transport(self.get_url()).mkdir('childrepo')
 
1319
        self.get_transport().mkdir('childrepo')
1319
1320
        child_control = self.bzrdir_format.initialize(url)
1320
1321
        child_repo = child_control.create_repository(shared=True)
1321
1322
        opened_control = bzrdir.BzrDir.open(self.get_url('childrepo'))
1334
1335
            # need a shared repository to test this.
1335
1336
            return
1336
1337
        url = self.get_url('intermediate')
1337
 
        transport.get_transport(self.get_url()).mkdir('intermediate')
1338
 
        transport.get_transport(self.get_url()).mkdir('intermediate/child')
 
1338
        t = self.get_transport()
 
1339
        t.mkdir('intermediate')
 
1340
        t.mkdir('intermediate/child')
1339
1341
        made_control = self.bzrdir_format.initialize(url)
1340
1342
        try:
1341
1343
            child_repo = made_control.open_repository()