/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/test_bundle.py

  • Committer: Robert Collins
  • Date: 2008-04-04 00:43:07 UTC
  • mfrom: (3331 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3333.
  • Revision ID: robertc@robertcollins.net-20080404004307-0whomfhm3yal2rvw
Resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bundle.py
28
28
    treebuilder,
29
29
    )
30
30
from bzrlib.bzrdir import BzrDir
 
31
from bzrlib.bundle import read_mergeable_from_url
31
32
from bzrlib.bundle.apply_bundle import install_bundle, merge_bundle
32
33
from bzrlib.bundle.bundle_data import BundleTree
 
34
from bzrlib.directory_service import directories
33
35
from bzrlib.bundle.serializer import write_bundle, read_bundle, v09, v4
34
36
from bzrlib.bundle.serializer.v08 import BundleSerializerV08
35
37
from bzrlib.bundle.serializer.v09 import BundleSerializerV09
47
49
    TestCaseInTempDir,
48
50
    TestCaseWithTransport,
49
51
    TestSkipped,
 
52
    test_read_bundle,
50
53
    test_commit,
51
54
    )
52
55
from bzrlib.transform import TreeTransform
1339
1342
        self.assertEqual('contents2\nstatic\n', vf.get_text('rev2'))
1340
1343
        rtree = target_repo.revision_tree('rev2')
1341
1344
        inventory_vf = target_repo.get_inventory_weave()
1342
 
        self.assertEqual(['rev1'], inventory_vf.get_parents('rev2'))
 
1345
        self.assertEqual({'rev2':('rev1',)},
 
1346
            inventory_vf.get_parent_map(['rev2']))
1343
1347
        self.assertEqual('changed file',
1344
1348
                         target_repo.get_revision('rev2').message)
1345
1349
 
1559
1563
        self.assertEqual((None, {'foo': 'bar', 'storage_kind': 'header'},
1560
1564
            'info', None, None), record)
1561
1565
        self.assertRaises(BadBundle, record_iter.next)
 
1566
 
 
1567
 
 
1568
class TestReadMergeableFromUrl(TestCaseWithTransport):
 
1569
 
 
1570
    def test_read_mergeable_skips_local(self):
 
1571
        """A local bundle named like the URL should not be read.
 
1572
        """
 
1573
        out, wt = test_read_bundle.create_bundle_file(self)
 
1574
        class FooService(object):
 
1575
            """A directory service that always returns source"""
 
1576
 
 
1577
            def look_up(self, name, url):
 
1578
                return 'source'
 
1579
        directories.register('foo:', FooService, 'Testing directory service')
 
1580
        self.addCleanup(lambda: directories.remove('foo:'))
 
1581
        self.build_tree_contents([('./foo:bar', out.getvalue())])
 
1582
        self.assertRaises(errors.NotABundle, read_mergeable_from_url,
 
1583
                          'foo:bar')