← 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: 2010-09-01 08:02:42 UTC
  • mfrom: (5390.3.3 faster-revert-593560)
  • Revision ID: pqm@pqm.ubuntu.com-20100901080242-esg62ody4frwmy66
(spiv) Avoid repeatedly calling self.target.all_file_ids() in
 InterTree.iter_changes. (Andrew Bennetts)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bzrdir.py
24
24
import sys
25
25
 
26
26
from bzrlib import (
 
27
    branch,
27
28
    bzrdir,
 
29
    controldir,
28
30
    errors,
29
31
    help_topics,
30
32
    repository,
68
70
        old_format = bzrdir.BzrDirFormat.get_default_format()
69
71
        # default is BzrDirFormat6
70
72
        self.failUnless(isinstance(old_format, bzrdir.BzrDirMetaFormat1))
71
 
        bzrdir.BzrDirFormat._set_default_format(SampleBzrDirFormat())
 
73
        controldir.ControlDirFormat._set_default_format(SampleBzrDirFormat())
72
74
        # creating a bzr dir should now create an instrumented dir.
73
75
        try:
74
76
            result = bzrdir.BzrDir.create('memory:///')
75
77
            self.failUnless(isinstance(result, SampleBzrDir))
76
78
        finally:
77
 
            bzrdir.BzrDirFormat._set_default_format(old_format)
 
79
            controldir.ControlDirFormat._set_default_format(old_format)
78
80
        self.assertEqual(old_format, bzrdir.BzrDirFormat.get_default_format())
79
81
 
80
82
 
81
83
class TestFormatRegistry(TestCase):
82
84
 
83
85
    def make_format_registry(self):
84
 
        my_format_registry = bzrdir.BzrDirFormatRegistry()
 
86
        my_format_registry = controldir.ControlDirFormatRegistry()
85
87
        my_format_registry.register('weave', bzrdir.BzrDirFormat6,
86
88
            'Pre-0.8 format.  Slower and does not support checkouts or shared'
87
89
            ' repositories', deprecated=True)
88
90
        my_format_registry.register_lazy('lazy', 'bzrlib.bzrdir',
89
91
            'BzrDirFormat6', 'Format registered lazily', deprecated=True)
90
 
        my_format_registry.register_metadir('knit',
 
92
        bzrdir.register_metadir(my_format_registry, 'knit',
91
93
            'bzrlib.repofmt.knitrepo.RepositoryFormatKnit1',
92
94
            'Format using knits',
93
95
            )
94
96
        my_format_registry.set_default('knit')
95
 
        my_format_registry.register_metadir(
 
97
        bzrdir.register_metadir(my_format_registry,
96
98
            'branch6',
97
99
            'bzrlib.repofmt.knitrepo.RepositoryFormatKnit3',
98
100
            'Experimental successor to knit.  Use at your own risk.',
99
101
            branch_format='bzrlib.branch.BzrBranchFormat6',
100
102
            experimental=True)
101
 
        my_format_registry.register_metadir(
 
103
        bzrdir.register_metadir(my_format_registry,
102
104
            'hidden format',
103
105
            'bzrlib.repofmt.knitrepo.RepositoryFormatKnit3',
104
106
            'Experimental successor to knit.  Use at your own risk.',
173
175
            bzrdir.format_registry.set_default_repository(old_default)
174
176
 
175
177
    def test_aliases(self):
176
 
        a_registry = bzrdir.BzrDirFormatRegistry()
 
178
        a_registry = controldir.ControlDirFormatRegistry()
177
179
        a_registry.register('weave', bzrdir.BzrDirFormat6,
178
180
            'Pre-0.8 format.  Slower and does not support checkouts or shared'
179
181
            ' repositories', deprecated=True)
888
890
        self.assertEqual(bar.root_transport.base, branches[1].base)
889
891
 
890
892
 
 
893
class TestMissingRepoBranchesSkipped(TestCaseWithMemoryTransport):
 
894
 
 
895
    def test_find_bzrdirs_missing_repo(self):
 
896
        transport = get_transport(self.get_url())
 
897
        arepo = self.make_repository('arepo', shared=True)
 
898
        abranch_url = arepo.user_url + '/abranch'
 
899
        abranch = bzrdir.BzrDir.create(abranch_url).create_branch()
 
900
        transport.delete_tree('arepo/.bzr')
 
901
        self.assertRaises(errors.NoRepositoryPresent,
 
902
            branch.Branch.open, abranch_url)
 
903
        self.make_branch('baz')
 
904
        for actual_bzrdir in bzrdir.BzrDir.find_branches(transport):
 
905
            self.assertEndsWith(actual_bzrdir.user_url, '/baz/')
 
906
 
 
907
 
891
908
class TestMeta1DirFormat(TestCaseWithTransport):
892
909
    """Tests specific to the meta1 dir format."""
893
910
 
1042
1059
    def _known_formats(self):
1043
1060
        return set([NotBzrDirFormat()])
1044
1061
 
1045
 
    @classmethod
 
1062
 
 
1063
class NotBzrDirProber(controldir.Prober):
 
1064
 
1046
1065
    def probe_transport(self, transport):
1047
1066
        """Our format is present if the transport ends in '.not/'."""
1048
1067
        if transport.has('.not'):
1062
1081
        dir = format.initialize(self.get_url())
1063
1082
        self.assertIsInstance(dir, NotBzrDir)
1064
1083
        # now probe for it.
1065
 
        bzrlib.bzrdir.BzrDirFormat.register_control_format(format)
 
1084
        controldir.ControlDirFormat.register_prober(NotBzrDirProber)
1066
1085
        try:
1067
1086
            found = bzrlib.bzrdir.BzrDirFormat.find_format(
1068
1087
                get_transport(self.get_url()))
1069
1088
            self.assertIsInstance(found, NotBzrDirFormat)
1070
1089
        finally:
1071
 
            bzrlib.bzrdir.BzrDirFormat.unregister_control_format(format)
 
1090
            controldir.ControlDirFormat.unregister_prober(NotBzrDirProber)
1072
1091
 
1073
1092
    def test_included_in_known_formats(self):
1074
 
        bzrlib.bzrdir.BzrDirFormat.register_control_format(NotBzrDirFormat)
 
1093
        not_format = NotBzrDirFormat()
 
1094
        bzrlib.controldir.ControlDirFormat.register_format(not_format)
1075
1095
        try:
1076
1096
            formats = bzrlib.bzrdir.BzrDirFormat.known_formats()
1077
1097
            for format in formats:
1079
1099
                    return
1080
1100
            self.fail("No NotBzrDirFormat in %s" % formats)
1081
1101
        finally:
1082
 
            bzrlib.bzrdir.BzrDirFormat.unregister_control_format(NotBzrDirFormat)
 
1102
            bzrlib.controldir.ControlDirFormat.unregister_format(not_format)
1083
1103
 
1084
1104
 
1085
1105
class NonLocalTests(TestCaseWithTransport):
1143
1163
    """
1144
1164
 
1145
1165
    def create_transport_readonly_server(self):
 
1166
        # We don't set the http protocol version, relying on the default
1146
1167
        return http_utils.HTTPServerRedirecting()
1147
1168
 
1148
1169
    def create_transport_secondary_server(self):
 
1170
        # We don't set the http protocol version, relying on the default
1149
1171
        return http_utils.HTTPServerRedirecting()
1150
1172
 
1151
1173
    def setUp(self):
1383
1405
        self.assertIsInstance(params, RepoInitHookParams)
1384
1406
        self.assertTrue(hasattr(params, 'bzrdir'))
1385
1407
        self.assertTrue(hasattr(params, 'repository'))
 
1408
 
 
1409
    def test_post_repo_init_hook_repr(self):
 
1410
        param_reprs = []
 
1411
        bzrdir.BzrDir.hooks.install_named_hook('post_repo_init',
 
1412
            lambda params: param_reprs.append(repr(params)), None)
 
1413
        self.make_repository('foo')
 
1414
        self.assertLength(1, param_reprs)
 
1415
        param_repr = param_reprs[0]
 
1416
        self.assertStartsWith(param_repr, '<RepoInitHookParams for ')
 
1417
 
 
1418
 
 
1419
class TestGenerateBackupName(TestCaseWithMemoryTransport):
 
1420
 
 
1421
    def setUp(self):
 
1422
        super(TestGenerateBackupName, self).setUp()
 
1423
        self._transport = get_transport(self.get_url())
 
1424
        bzrdir.BzrDir.create(self.get_url(),
 
1425
            possible_transports=[self._transport])
 
1426
        self._bzrdir = bzrdir.BzrDir.open_from_transport(self._transport)
 
1427
 
 
1428
    def test_new(self):
 
1429
        self.assertEqual("a.~1~", self._bzrdir.generate_backup_name("a"))
 
1430
 
 
1431
    def test_exiting(self):
 
1432
        self._transport.put_bytes("a.~1~", "some content")
 
1433
        self.assertEqual("a.~2~", self._bzrdir.generate_backup_name("a"))