/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 bzrlib/tests/per_controldir/test_controldir.py

  • Committer: Andrew Bennetts
  • Date: 2011-02-07 04:14:29 UTC
  • mfrom: (5535.4.26 fetch-all-tags-309682)
  • mto: This revision was merged to the branch mainline in revision 5648.
  • Revision ID: andrew.bennetts@canonical.com-20110207041429-3kc1blj34rvvxod9
Merge fetch-all-tags-309682.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_controldir/test_controldir.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006-2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
17
17
"""Tests for control directory implementations - tests a controldir format."""
18
18
 
19
19
from itertools import izip
20
 
import os
21
20
 
22
21
import bzrlib.branch
23
22
from bzrlib import (
34
33
    )
35
34
import bzrlib.revision
36
35
from bzrlib.tests import (
37
 
                          ChrootedTestCase,
38
 
                          TestNotApplicable,
39
 
                          TestSkipped,
40
 
                          )
 
36
    ChrootedTestCase,
 
37
    TestNotApplicable,
 
38
    TestSkipped,
 
39
    )
41
40
from bzrlib.tests.per_controldir import TestCaseWithControlDir
42
41
from bzrlib.transport.local import LocalTransport
43
42
from bzrlib.ui import (
44
43
    CannedInputUIFactory,
45
44
    )
46
 
from bzrlib.remote import RemoteBzrDir, RemoteRepository
 
45
from bzrlib.remote import (
 
46
    RemoteBzrDir,
 
47
    RemoteRepository,
 
48
    )
47
49
from bzrlib.repofmt import weaverepo
48
50
 
49
51
 
257
259
 
258
260
    def test_clone_bzrdir_branch_and_repo_fixed_user_id(self):
259
261
        # Bug #430868 is about an email containing '.sig'
260
 
        os.environ['BZR_EMAIL'] = 'murphy@host.sighup.org'
 
262
        self.overrideEnv('BZR_EMAIL', 'murphy@host.sighup.org')
261
263
        tree = self.make_branch_and_tree('commit_tree')
262
264
        self.build_tree(['commit_tree/foo'])
263
265
        tree.add('foo')
855
857
        tree.commit('revision 1', rev_id='1')
856
858
        tree.commit('revision 2', rev_id='2', allow_pointless=True)
857
859
        dir = tree.bzrdir
858
 
        if isinstance(dir, (bzrdir.BzrDirPreSplitOut,)):
859
 
            self.assertRaises(errors.MustHaveWorkingTree, dir.sprout,
860
 
                              self.get_url('target'),
861
 
                              create_tree_if_local=False)
862
 
            return
863
 
        target = dir.sprout(self.get_url('target'), create_tree_if_local=False)
 
860
        try:
 
861
            target = dir.sprout(self.get_url('target'),
 
862
                create_tree_if_local=False)
 
863
        except errors.MustHaveWorkingTree:
 
864
            raise TestNotApplicable("control dir format requires working tree")
864
865
        self.failIfExists('target/foo')
865
866
        self.assertEqual(tree.branch.last_revision(),
866
867
                         target.open_branch().last_revision())
903
904
            '_network_name', None),
904
905
            None)
905
906
        # supported formats must be able to init and open
906
 
        t = transport.get_transport(self.get_url())
907
 
        readonly_t = transport.get_transport(self.get_readonly_url())
 
907
        t = self.get_transport()
 
908
        readonly_t = self.get_readonly_transport()
908
909
        made_control = self.bzrdir_format.initialize(t.base)
909
910
        self.failUnless(isinstance(made_control, controldir.ControlDir))
910
911
        self.assertEqual(self.bzrdir_format,
1124
1125
            # because the default open will not open them and
1125
1126
            # they may not be initializable.
1126
1127
            return
1127
 
        t = transport.get_transport(self.get_url())
 
1128
        t = self.get_transport()
1128
1129
        made_control = self.bzrdir_format.initialize(t.base)
1129
1130
        made_repo = made_control.create_repository()
1130
1131
        made_branch = made_control.create_branch()
1137
1138
            # because the default open will not open them and
1138
1139
            # they may not be initializable.
1139
1140
            return
1140
 
        t = transport.get_transport(self.get_url())
 
1141
        t = self.get_transport()
1141
1142
        made_control = self.bzrdir_format.initialize(t.base)
1142
1143
        made_repo = made_control.create_repository()
1143
1144
        made_branch = made_control.create_branch()
1152
1153
            # because the default open will not open them and
1153
1154
            # they may not be initializable.
1154
1155
            return
1155
 
        t = transport.get_transport(self.get_url())
 
1156
        t = self.get_transport()
1156
1157
        made_control = self.bzrdir_format.initialize(t.base)
1157
1158
        made_repo = made_control.create_repository()
1158
1159
        made_branch = made_control.create_branch()
1173
1174
            # because the default open will not open them and
1174
1175
            # they may not be initializable.
1175
1176
            return
1176
 
        t = transport.get_transport(self.get_url())
 
1177
        t = self.get_transport()
1177
1178
        made_control = self.bzrdir_format.initialize(t.base)
1178
1179
        made_repo = made_control.create_repository()
1179
1180
        # Check that we have a repository object.
1188
1189
            # because the default open will not open them and
1189
1190
            # they may not be initializable.
1190
1191
            return
1191
 
        t = transport.get_transport(self.get_url())
 
1192
        t = self.get_transport()
1192
1193
        made_control = self.bzrdir_format.initialize(t.base)
1193
1194
        try:
1194
1195
            made_repo = made_control.create_repository(shared=True)
1205
1206
            # because the default open will not open them and
1206
1207
            # they may not be initializable.
1207
1208
            return
1208
 
        t = transport.get_transport(self.get_url())
 
1209
        t = self.get_transport()
1209
1210
        made_control = self.bzrdir_format.initialize(t.base)
1210
1211
        made_repo = made_control.create_repository(shared=False)
1211
1212
        self.assertFalse(made_repo.is_shared())
1216
1217
            # because the default open will not open them and
1217
1218
            # they may not be initializable.
1218
1219
            return
1219
 
        t = transport.get_transport(self.get_url())
 
1220
        t = self.get_transport()
1220
1221
        made_control = self.bzrdir_format.initialize(t.base)
1221
1222
        made_repo = made_control.create_repository()
1222
1223
        opened_repo = made_control.open_repository()
1306
1307
        self.assertTrue(isinstance(dir.get_repository_transport(None),
1307
1308
                                   transport.Transport))
1308
1309
        # with a given format, either the bzr dir supports identifiable
1309
 
        # repositories, or it supports anonymous  repository formats, but not both.
 
1310
        # repositories, or it supports anonymous repository formats, but not both.
1310
1311
        anonymous_format = weaverepo.RepositoryFormat6()
1311
1312
        identifiable_format = weaverepo.RepositoryFormat7()
1312
1313
        try:
1344
1345
    def test_root_transport(self):
1345
1346
        dir = self.make_bzrdir('.')
1346
1347
        self.assertEqual(dir.root_transport.base,
1347
 
                         transport.get_transport(self.get_url('.')).base)
 
1348
                         self.get_transport().base)
1348
1349
 
1349
1350
    def test_find_repository_no_repo_under_standalone_branch(self):
1350
1351
        # finding a repo stops at standalone branches even if there is a
1355
1356
            # need a shared repository to test this.
1356
1357
            return
1357
1358
        url = self.get_url('intermediate')
1358
 
        transport.get_transport(self.get_url()).mkdir('intermediate')
1359
 
        transport.get_transport(self.get_url()).mkdir('intermediate/child')
 
1359
        t = self.get_transport()
 
1360
        t.mkdir('intermediate')
 
1361
        t.mkdir('intermediate/child')
1360
1362
        made_control = self.bzrdir_format.initialize(url)
1361
1363
        made_control.create_repository()
1362
1364
        innermost_control = self.bzrdir_format.initialize(
1380
1382
            # need a shared repository to test this.
1381
1383
            return
1382
1384
        url = self.get_url('childbzrdir')
1383
 
        transport.get_transport(self.get_url()).mkdir('childbzrdir')
 
1385
        self.get_transport().mkdir('childbzrdir')
1384
1386
        made_control = self.bzrdir_format.initialize(url)
1385
1387
        try:
1386
1388
            child_repo = made_control.open_repository()
1414
1416
            # need a shared repository to test this.
1415
1417
            return
1416
1418
        url = self.get_url('childrepo')
1417
 
        transport.get_transport(self.get_url()).mkdir('childrepo')
 
1419
        self.get_transport().mkdir('childrepo')
1418
1420
        child_control = self.bzrdir_format.initialize(url)
1419
1421
        child_repo = child_control.create_repository(shared=True)
1420
1422
        opened_control = bzrdir.BzrDir.open(self.get_url('childrepo'))
1433
1435
            # need a shared repository to test this.
1434
1436
            return
1435
1437
        url = self.get_url('intermediate')
1436
 
        transport.get_transport(self.get_url()).mkdir('intermediate')
1437
 
        transport.get_transport(self.get_url()).mkdir('intermediate/child')
 
1438
        t = self.get_transport()
 
1439
        t.mkdir('intermediate')
 
1440
        t.mkdir('intermediate/child')
1438
1441
        made_control = self.bzrdir_format.initialize(url)
1439
1442
        try:
1440
1443
            child_repo = made_control.open_repository()