← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_foreign.py

  • Committer: Danny van Heumen
  • Date: 2010-03-09 16:38:10 UTC
  • mto: (4634.139.5 2.0)
  • mto: This revision was merged to the branch mainline in revision 5160.
  • Revision ID: danny@dannyvanheumen.nl-20100309163810-ujn8hcx08f75nlf1
Refined test to make use of locking hooks and also validate if lock is truly a checkout-lock.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_foreign.py
1
 
# Copyright (C) 2008, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2008 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
20
20
 
21
21
from bzrlib import (
22
22
    branch,
23
 
    bzrdir,
24
 
    controldir,
25
23
    errors,
26
24
    foreign,
27
25
    lockable_files,
28
26
    lockdir,
29
 
    revision,
30
 
    tests,
31
27
    trace,
32
28
    )
 
29
from bzrlib.bzrdir import (
 
30
    BzrDir,
 
31
    BzrDirFormat,
 
32
    BzrDirMeta1,
 
33
    BzrDirMetaFormat1,
 
34
    format_registry,
 
35
    )
 
36
from bzrlib.inventory import Inventory
 
37
from bzrlib.revision import (
 
38
    NULL_REVISION,
 
39
    Revision,
 
40
    )
 
41
from bzrlib.tests import (
 
42
    TestCase,
 
43
    TestCaseWithTransport,
 
44
    )
33
45
 
34
46
# This is the dummy foreign revision control system, used 
35
47
# mainly here in the testsuite to test the foreign VCS infrastructure.
75
87
        self.mapping_registry = DummyForeignVcsMappingRegistry()
76
88
        self.mapping_registry.register("v1", DummyForeignVcsMapping(self),
77
89
                                       "Version 1")
78
 
        self.abbreviation = "dummy"
79
90
 
80
91
    def show_foreign_revid(self, foreign_revid):
81
92
        return { "dummy ding": "%s/%s\\%s" % foreign_revid }
82
93
 
83
 
    def serialize_foreign_revid(self, foreign_revid):
84
 
        return "%s|%s|%s" % foreign_revid
85
 
 
86
94
 
87
95
class DummyForeignVcsBranch(branch.BzrBranch6,foreign.ForeignBranch):
88
96
    """A Dummy VCS Branch."""
91
99
        self._format = _format
92
100
        self._base = a_bzrdir.transport.base
93
101
        self._ignore_fallbacks = False
94
 
        self.bzrdir = a_bzrdir
95
102
        foreign.ForeignBranch.__init__(self, 
96
103
            DummyForeignVcsMapping(DummyForeignVcs()))
97
104
        branch.BzrBranch6.__init__(self, _format, _control_files, a_bzrdir, 
105
112
    def is_compatible(source, target):
106
113
        return isinstance(target, DummyForeignVcsBranch)
107
114
 
108
 
    def push(self, overwrite=False, stop_revision=None):
109
 
        raise errors.NoRoundtrippingSupport(self.source, self.target)
110
 
 
111
115
    def lossy_push(self, stop_revision=None):
112
116
        result = branch.BranchPushResult()
113
117
        result.source_branch = self.source
132
136
                    (str(rev.timestamp), str(rev.timezone), 
133
137
                        str(self.target.revno())))
134
138
                parent_revno, parent_revid= self.target.last_revision_info()
135
 
                if parent_revid == revision.NULL_REVISION:
 
139
                if parent_revid == NULL_REVISION:
136
140
                    parent_revids = []
137
141
                else:
138
142
                    parent_revids = [parent_revid]
173
177
        super(DummyForeignVcsBranchFormat, self).__init__()
174
178
        self._matchingbzrdir = DummyForeignVcsDirFormat()
175
179
 
176
 
    def open(self, a_bzrdir, name=None, _found=False):
 
180
    def open(self, a_bzrdir, _found=False):
177
181
        if not _found:
178
182
            raise NotImplementedError
179
183
        try:
180
 
            transport = a_bzrdir.get_branch_transport(None, name=name)
 
184
            transport = a_bzrdir.get_branch_transport(None)
181
185
            control_files = lockable_files.LockableFiles(transport, 'lock',
182
186
                                                         lockdir.LockDir)
183
187
            return DummyForeignVcsBranch(_format=self,
188
192
            raise errors.NotBranchError(path=transport.base)
189
193
 
190
194
 
191
 
class DummyForeignVcsDirFormat(bzrdir.BzrDirMetaFormat1):
 
195
class DummyForeignVcsDirFormat(BzrDirMetaFormat1):
192
196
    """BzrDirFormat for the dummy foreign VCS."""
193
197
 
194
198
    @classmethod
206
210
    def get_branch_format(self):
207
211
        return DummyForeignVcsBranchFormat()
208
212
 
 
213
    @classmethod
 
214
    def probe_transport(klass, transport):
 
215
        """Return the .bzrdir style format present in a directory."""
 
216
        if not transport.has('.dummy'):
 
217
            raise errors.NotBranchError(path=transport.base)
 
218
        return klass()
 
219
 
209
220
    def initialize_on_transport(self, transport):
210
221
        """Initialize a new bzrdir in the base directory of a Transport."""
211
222
        # Since we don't have a .bzr directory, inherit the
228
239
        return DummyForeignVcsDir(transport, self)
229
240
 
230
241
 
231
 
class DummyForeignVcsDir(bzrdir.BzrDirMeta1):
 
242
class DummyForeignVcsDir(BzrDirMeta1):
232
243
 
233
244
    def __init__(self, _transport, _format):
234
245
        self._format = _format
238
249
        self._control_files = lockable_files.LockableFiles(self.transport,
239
250
            "lock", lockable_files.TransportLock)
240
251
 
241
 
    def open_branch(self, name=None, unsupported=False, ignore_fallbacks=True):
242
 
        if name is not None:
243
 
            raise errors.NoColocatedBranchSupport(self)
 
252
    def open_branch(self, ignore_fallbacks=True):
244
253
        return self._format.get_branch_format().open(self, _found=True)
245
254
 
246
255
    def cloning_metadir(self, stacked=False):
247
256
        """Produce a metadir suitable for cloning with."""
248
 
        return bzrdir.format_registry.make_bzrdir("default")
 
257
        return format_registry.make_bzrdir("default")
249
258
 
250
259
    def sprout(self, url, revision_id=None, force_new_repo=False,
251
260
               recurse='down', possible_transports=None,
259
268
                hardlink=hardlink, stacked=stacked, source_branch=source_branch)
260
269
 
261
270
 
262
 
def register_dummy_foreign_for_test(testcase):
263
 
    controldir.ControlDirFormat.register_format(DummyForeignVcsDirFormat)
264
 
    testcase.addCleanup(controldir.ControlDirFormat.unregister_format,
265
 
                        DummyForeignVcsDirFormat)
266
 
    controldir.ControlDirFormat.register_prober(DummyForeignProber)
267
 
    testcase.addCleanup(controldir.ControlDirFormat.unregister_prober,
268
 
        DummyForeignProber)
269
 
    # We need to register the optimiser to make the dummy appears really
270
 
    # different from a regular bzr repository.
271
 
    branch.InterBranch.register_optimiser(InterToDummyVcsBranch)
272
 
    testcase.addCleanup(branch.InterBranch.unregister_optimiser,
273
 
                        InterToDummyVcsBranch)
274
 
 
275
 
 
276
 
class DummyForeignProber(controldir.Prober):
277
 
 
278
 
    @classmethod
279
 
    def probe_transport(klass, transport):
280
 
        """Return the .bzrdir style format present in a directory."""
281
 
        if not transport.has('.dummy'):
282
 
            raise errors.NotBranchError(path=transport.base)
283
 
        return DummyForeignVcsDirFormat()
284
 
 
285
 
 
286
 
class ForeignVcsRegistryTests(tests.TestCase):
 
271
class ForeignVcsRegistryTests(TestCase):
287
272
    """Tests for the ForeignVcsRegistry class."""
288
273
 
289
274
    def test_parse_revision_id_no_dash(self):
304
289
                          reg.parse_revision_id("dummy-v1:some-foreign-revid"))
305
290
 
306
291
 
307
 
class ForeignRevisionTests(tests.TestCase):
 
292
class ForeignRevisionTests(TestCase):
308
293
    """Tests for the ForeignRevision class."""
309
294
 
310
295
    def test_create(self):
316
301
        self.assertEquals(mapp, rev.mapping)
317
302
 
318
303
 
319
 
class WorkingTreeFileUpdateTests(tests.TestCaseWithTransport):
 
304
class WorkingTreeFileUpdateTests(TestCaseWithTransport):
320
305
    """Tests for update_workingtree_fileids()."""
321
306
 
322
307
    def test_update_workingtree(self):
340
325
            wt.unlock()
341
326
 
342
327
 
343
 
class DummyForeignVcsTests(tests.TestCaseWithTransport):
 
328
class DummyForeignVcsTests(TestCaseWithTransport):
344
329
    """Very basic test for DummyForeignVcs."""
345
330
 
346
331
    def setUp(self):
 
332
        BzrDirFormat.register_control_format(DummyForeignVcsDirFormat)
 
333
        branch.InterBranch.register_optimiser(InterToDummyVcsBranch)
 
334
        self.addCleanup(self.unregister)
347
335
        super(DummyForeignVcsTests, self).setUp()
348
 
        register_dummy_foreign_for_test(self)
 
336
 
 
337
    def unregister(self):
 
338
        try:
 
339
            BzrDirFormat.unregister_control_format(DummyForeignVcsDirFormat)
 
340
        except ValueError:
 
341
            pass
 
342
        branch.InterBranch.unregister_optimiser(InterToDummyVcsBranch)
349
343
 
350
344
    def test_create(self):
351
345
        """Test we can create dummies."""
352
346
        self.make_branch_and_tree("d", format=DummyForeignVcsDirFormat())
353
 
        dir = bzrdir.BzrDir.open("d")
 
347
        dir = BzrDir.open("d")
354
348
        self.assertEquals("A Dummy VCS Dir", dir._format.get_format_string())
355
349
        dir.open_repository()
356
350
        dir.open_branch()
359
353
    def test_sprout(self):
360
354
        """Test we can clone dummies and that the format is not preserved."""
361
355
        self.make_branch_and_tree("d", format=DummyForeignVcsDirFormat())
362
 
        dir = bzrdir.BzrDir.open("d")
 
356
        dir = BzrDir.open("d")
363
357
        newdir = dir.sprout("e")
364
 
        self.assertNotEquals("A Dummy VCS Dir",
365
 
                             newdir._format.get_format_string())
366
 
 
367
 
    def test_push_not_supported(self):
368
 
        source_tree = self.make_branch_and_tree("source")
369
 
        target_tree = self.make_branch_and_tree("target", 
370
 
            format=DummyForeignVcsDirFormat())
371
 
        self.assertRaises(errors.NoRoundtrippingSupport, 
372
 
            source_tree.branch.push, target_tree.branch)
 
358
        self.assertNotEquals("A Dummy VCS Dir", newdir._format.get_format_string())
373
359
 
374
360
    def test_lossy_push_empty(self):
375
361
        source_tree = self.make_branch_and_tree("source")
376
362
        target_tree = self.make_branch_and_tree("target", 
377
363
            format=DummyForeignVcsDirFormat())
378
364
        pushresult = source_tree.branch.lossy_push(target_tree.branch)
379
 
        self.assertEquals(revision.NULL_REVISION, pushresult.old_revid)
380
 
        self.assertEquals(revision.NULL_REVISION, pushresult.new_revid)
 
365
        self.assertEquals(NULL_REVISION, pushresult.old_revid)
 
366
        self.assertEquals(NULL_REVISION, pushresult.new_revid)
381
367
        self.assertEquals({}, pushresult.revidmap)
382
368
 
383
369
    def test_lossy_push_simple(self):
392
378
            pushresult = source_tree.branch.lossy_push(target_tree.branch)
393
379
        finally:
394
380
            target_tree.branch.unlock()
395
 
        self.assertEquals(revision.NULL_REVISION, pushresult.old_revid)
 
381
        self.assertEquals(NULL_REVISION, pushresult.old_revid)
396
382
        self.assertEquals({revid1:target_tree.branch.last_revision()}, 
397
383
                           pushresult.revidmap)
398
384
        self.assertEquals(pushresult.revidmap[revid1], pushresult.new_revid)