← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bundle.py

Merge trunk

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
32
31
from bzrlib.bundle.apply_bundle import install_bundle, merge_bundle
33
32
from bzrlib.bundle.bundle_data import BundleTree
34
 
from bzrlib.directory_service import directories
35
33
from bzrlib.bundle.serializer import write_bundle, read_bundle, v09, v4
36
34
from bzrlib.bundle.serializer.v08 import BundleSerializerV08
37
35
from bzrlib.bundle.serializer.v09 import BundleSerializerV09
49
47
    TestCaseInTempDir,
50
48
    TestCaseWithTransport,
51
49
    TestSkipped,
52
 
    test_read_bundle,
53
50
    test_commit,
54
51
    )
55
52
from bzrlib.transform import TreeTransform
1342
1339
        self.assertEqual('contents2\nstatic\n', vf.get_text('rev2'))
1343
1340
        rtree = target_repo.revision_tree('rev2')
1344
1341
        inventory_vf = target_repo.get_inventory_weave()
1345
 
        self.assertEqual({'rev2':('rev1',)},
1346
 
            inventory_vf.get_parent_map(['rev2']))
 
1342
        self.assertEqual(['rev1'], inventory_vf.get_parents('rev2'))
1347
1343
        self.assertEqual('changed file',
1348
1344
                         target_repo.get_revision('rev2').message)
1349
1345
 
1563
1559
        self.assertEqual((None, {'foo': 'bar', 'storage_kind': 'header'},
1564
1560
            'info', None, None), record)
1565
1561
        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')