← 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: John Arbash Meinel
  • Date: 2010-08-24 19:21:32 UTC
  • mto: This revision was merged to the branch mainline in revision 5390.
  • Revision ID: john@arbash-meinel.com-20100824192132-2ktt5adkbk5bk1ct
Handle test_source and extensions. Also define an 'extern' protocol, to allow
the test suite to recognize that returning an object of that type is a Python object.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_foreign.py
1
 
# Copyright (C) 2008 Canonical Ltd
 
1
# Copyright (C) 2008, 2009, 2010 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,
23
24
    errors,
24
25
    foreign,
25
26
    lockable_files,
26
27
    lockdir,
 
28
    revision,
 
29
    tests,
27
30
    trace,
28
31
    )
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
 
    )
45
32
 
46
33
# This is the dummy foreign revision control system, used 
47
34
# mainly here in the testsuite to test the foreign VCS infrastructure.
87
74
        self.mapping_registry = DummyForeignVcsMappingRegistry()
88
75
        self.mapping_registry.register("v1", DummyForeignVcsMapping(self),
89
76
                                       "Version 1")
 
77
        self.abbreviation = "dummy"
90
78
 
91
79
    def show_foreign_revid(self, foreign_revid):
92
80
        return { "dummy ding": "%s/%s\\%s" % foreign_revid }
93
81
 
 
82
    def serialize_foreign_revid(self, foreign_revid):
 
83
        return "%s|%s|%s" % foreign_revid
 
84
 
94
85
 
95
86
class DummyForeignVcsBranch(branch.BzrBranch6,foreign.ForeignBranch):
96
87
    """A Dummy VCS Branch."""
99
90
        self._format = _format
100
91
        self._base = a_bzrdir.transport.base
101
92
        self._ignore_fallbacks = False
 
93
        self.bzrdir = a_bzrdir
102
94
        foreign.ForeignBranch.__init__(self, 
103
95
            DummyForeignVcsMapping(DummyForeignVcs()))
104
96
        branch.BzrBranch6.__init__(self, _format, _control_files, a_bzrdir, 
112
104
    def is_compatible(source, target):
113
105
        return isinstance(target, DummyForeignVcsBranch)
114
106
 
 
107
    def push(self, overwrite=False, stop_revision=None):
 
108
        raise errors.NoRoundtrippingSupport(self.source, self.target)
 
109
 
115
110
    def lossy_push(self, stop_revision=None):
116
111
        result = branch.BranchPushResult()
117
112
        result.source_branch = self.source
136
131
                    (str(rev.timestamp), str(rev.timezone), 
137
132
                        str(self.target.revno())))
138
133
                parent_revno, parent_revid= self.target.last_revision_info()
139
 
                if parent_revid == NULL_REVISION:
 
134
                if parent_revid == revision.NULL_REVISION:
140
135
                    parent_revids = []
141
136
                else:
142
137
                    parent_revids = [parent_revid]
177
172
        super(DummyForeignVcsBranchFormat, self).__init__()
178
173
        self._matchingbzrdir = DummyForeignVcsDirFormat()
179
174
 
180
 
    def open(self, a_bzrdir, _found=False):
 
175
    def open(self, a_bzrdir, name=None, _found=False):
181
176
        if not _found:
182
177
            raise NotImplementedError
183
178
        try:
184
 
            transport = a_bzrdir.get_branch_transport(None)
 
179
            transport = a_bzrdir.get_branch_transport(None, name=name)
185
180
            control_files = lockable_files.LockableFiles(transport, 'lock',
186
181
                                                         lockdir.LockDir)
187
182
            return DummyForeignVcsBranch(_format=self,
192
187
            raise errors.NotBranchError(path=transport.base)
193
188
 
194
189
 
195
 
class DummyForeignVcsDirFormat(BzrDirMetaFormat1):
 
190
class DummyForeignVcsDirFormat(bzrdir.BzrDirMetaFormat1):
196
191
    """BzrDirFormat for the dummy foreign VCS."""
197
192
 
198
193
    @classmethod
239
234
        return DummyForeignVcsDir(transport, self)
240
235
 
241
236
 
242
 
class DummyForeignVcsDir(BzrDirMeta1):
 
237
class DummyForeignVcsDir(bzrdir.BzrDirMeta1):
243
238
 
244
239
    def __init__(self, _transport, _format):
245
240
        self._format = _format
249
244
        self._control_files = lockable_files.LockableFiles(self.transport,
250
245
            "lock", lockable_files.TransportLock)
251
246
 
252
 
    def open_branch(self, ignore_fallbacks=True):
 
247
    def open_branch(self, name=None, unsupported=False, ignore_fallbacks=True):
 
248
        if name is not None:
 
249
            raise errors.NoColocatedBranchSupport(self)
253
250
        return self._format.get_branch_format().open(self, _found=True)
254
251
 
255
252
    def cloning_metadir(self, stacked=False):
256
253
        """Produce a metadir suitable for cloning with."""
257
 
        return format_registry.make_bzrdir("default")
 
254
        return bzrdir.format_registry.make_bzrdir("default")
258
255
 
259
256
    def sprout(self, url, revision_id=None, force_new_repo=False,
260
257
               recurse='down', possible_transports=None,
268
265
                hardlink=hardlink, stacked=stacked, source_branch=source_branch)
269
266
 
270
267
 
271
 
class ForeignVcsRegistryTests(TestCase):
 
268
def register_dummy_foreign_for_test(testcase):
 
269
    bzrdir.BzrDirFormat.register_control_format(DummyForeignVcsDirFormat)
 
270
    testcase.addCleanup(bzrdir.BzrDirFormat.unregister_control_format,
 
271
                        DummyForeignVcsDirFormat)
 
272
    # We need to register the optimiser to make the dummy appears really
 
273
    # different from a regular bzr repository.
 
274
    branch.InterBranch.register_optimiser(InterToDummyVcsBranch)
 
275
    testcase.addCleanup(branch.InterBranch.unregister_optimiser,
 
276
                        InterToDummyVcsBranch)
 
277
 
 
278
 
 
279
class ForeignVcsRegistryTests(tests.TestCase):
272
280
    """Tests for the ForeignVcsRegistry class."""
273
281
 
274
282
    def test_parse_revision_id_no_dash(self):
289
297
                          reg.parse_revision_id("dummy-v1:some-foreign-revid"))
290
298
 
291
299
 
292
 
class ForeignRevisionTests(TestCase):
 
300
class ForeignRevisionTests(tests.TestCase):
293
301
    """Tests for the ForeignRevision class."""
294
302
 
295
303
    def test_create(self):
301
309
        self.assertEquals(mapp, rev.mapping)
302
310
 
303
311
 
304
 
class WorkingTreeFileUpdateTests(TestCaseWithTransport):
 
312
class WorkingTreeFileUpdateTests(tests.TestCaseWithTransport):
305
313
    """Tests for update_workingtree_fileids()."""
306
314
 
307
315
    def test_update_workingtree(self):
309
317
        self.build_tree_contents([('br1/bla', 'original contents\n')])
310
318
        wt.add('bla', 'bla-a')
311
319
        wt.commit('bla-a')
 
320
        root_id = wt.get_root_id()
312
321
        target = wt.bzrdir.sprout('br2').open_workingtree()
313
322
        target.unversion(['bla-a'])
314
323
        target.add('bla', 'bla-b')
319
328
        foreign.update_workingtree_fileids(wt, target_basis)
320
329
        wt.lock_read()
321
330
        try:
322
 
            self.assertEquals(["TREE_ROOT", "bla-b"], list(wt.inventory))
 
331
            self.assertEquals(set([root_id, "bla-b"]), set(wt.inventory))
323
332
        finally:
324
333
            wt.unlock()
325
334
 
326
335
 
327
 
class DummyForeignVcsTests(TestCaseWithTransport):
 
336
class DummyForeignVcsTests(tests.TestCaseWithTransport):
328
337
    """Very basic test for DummyForeignVcs."""
329
338
 
330
339
    def setUp(self):
331
 
        BzrDirFormat.register_control_format(DummyForeignVcsDirFormat)
332
 
        branch.InterBranch.register_optimiser(InterToDummyVcsBranch)
333
 
        self.addCleanup(self.unregister)
334
340
        super(DummyForeignVcsTests, self).setUp()
335
 
 
336
 
    def unregister(self):
337
 
        try:
338
 
            BzrDirFormat.unregister_control_format(DummyForeignVcsDirFormat)
339
 
        except ValueError:
340
 
            pass
341
 
        branch.InterBranch.unregister_optimiser(InterToDummyVcsBranch)
 
341
        register_dummy_foreign_for_test(self)
342
342
 
343
343
    def test_create(self):
344
344
        """Test we can create dummies."""
345
345
        self.make_branch_and_tree("d", format=DummyForeignVcsDirFormat())
346
 
        dir = BzrDir.open("d")
 
346
        dir = bzrdir.BzrDir.open("d")
347
347
        self.assertEquals("A Dummy VCS Dir", dir._format.get_format_string())
348
348
        dir.open_repository()
349
349
        dir.open_branch()
352
352
    def test_sprout(self):
353
353
        """Test we can clone dummies and that the format is not preserved."""
354
354
        self.make_branch_and_tree("d", format=DummyForeignVcsDirFormat())
355
 
        dir = BzrDir.open("d")
 
355
        dir = bzrdir.BzrDir.open("d")
356
356
        newdir = dir.sprout("e")
357
 
        self.assertNotEquals("A Dummy VCS Dir", newdir._format.get_format_string())
 
357
        self.assertNotEquals("A Dummy VCS Dir",
 
358
                             newdir._format.get_format_string())
 
359
 
 
360
    def test_push_not_supported(self):
 
361
        source_tree = self.make_branch_and_tree("source")
 
362
        target_tree = self.make_branch_and_tree("target", 
 
363
            format=DummyForeignVcsDirFormat())
 
364
        self.assertRaises(errors.NoRoundtrippingSupport, 
 
365
            source_tree.branch.push, target_tree.branch)
358
366
 
359
367
    def test_lossy_push_empty(self):
360
368
        source_tree = self.make_branch_and_tree("source")
361
369
        target_tree = self.make_branch_and_tree("target", 
362
370
            format=DummyForeignVcsDirFormat())
363
371
        pushresult = source_tree.branch.lossy_push(target_tree.branch)
364
 
        self.assertEquals(NULL_REVISION, pushresult.old_revid)
365
 
        self.assertEquals(NULL_REVISION, pushresult.new_revid)
 
372
        self.assertEquals(revision.NULL_REVISION, pushresult.old_revid)
 
373
        self.assertEquals(revision.NULL_REVISION, pushresult.new_revid)
366
374
        self.assertEquals({}, pushresult.revidmap)
367
375
 
368
376
    def test_lossy_push_simple(self):
377
385
            pushresult = source_tree.branch.lossy_push(target_tree.branch)
378
386
        finally:
379
387
            target_tree.branch.unlock()
380
 
        self.assertEquals(NULL_REVISION, pushresult.old_revid)
 
388
        self.assertEquals(revision.NULL_REVISION, pushresult.old_revid)
381
389
        self.assertEquals({revid1:target_tree.branch.last_revision()}, 
382
390
                           pushresult.revidmap)
383
391
        self.assertEquals(pushresult.revidmap[revid1], pushresult.new_revid)