← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bundle.py

  • Committer: Andrew Bennetts
  • Date: 2009-04-02 05:53:12 UTC
  • mto: This revision was merged to the branch mainline in revision 4242.
  • Revision ID: andrew.bennetts@canonical.com-20090402055312-h7mvgumvm7e620mj
Fix nits in spelling and naming.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bundle.py
1
 
# Copyright (C) 2005-2011 Canonical Ltd
 
1
# Copyright (C) 2004, 2005, 2006, 2007 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
22
22
 
23
23
from bzrlib import (
24
24
    bzrdir,
25
 
    diff,
26
25
    errors,
27
26
    inventory,
28
 
    merge,
29
27
    osutils,
 
28
    repository,
30
29
    revision as _mod_revision,
31
 
    symbol_versioning,
32
 
    tests,
33
30
    treebuilder,
34
31
    )
35
32
from bzrlib.bundle import read_mergeable_from_url
36
33
from bzrlib.bundle.apply_bundle import install_bundle, merge_bundle
37
34
from bzrlib.bundle.bundle_data import BundleTree
 
35
from bzrlib.bzrdir import BzrDir
38
36
from bzrlib.directory_service import directories
39
37
from bzrlib.bundle.serializer import write_bundle, read_bundle, v09, v4
40
38
from bzrlib.bundle.serializer.v08 import BundleSerializerV08
41
39
from bzrlib.bundle.serializer.v09 import BundleSerializerV09
42
40
from bzrlib.bundle.serializer.v4 import BundleSerializerV4
 
41
from bzrlib.branch import Branch
 
42
from bzrlib.diff import internal_diff
 
43
from bzrlib.merge import Merge3Merger
43
44
from bzrlib.repofmt import knitrepo
 
45
from bzrlib.osutils import sha_file, sha_string
44
46
from bzrlib.tests import (
 
47
    SymlinkFeature,
 
48
    TestCase,
 
49
    TestCaseInTempDir,
 
50
    TestCaseWithTransport,
 
51
    TestSkipped,
45
52
    test_read_bundle,
46
53
    test_commit,
47
54
    )
48
55
from bzrlib.transform import TreeTransform
49
 
from bzrlib.tests import (
50
 
    features,
51
 
    )
52
 
 
53
 
 
54
 
def get_text(vf, key):
55
 
    """Get the fulltext for a given revision id that is present in the vf"""
56
 
    stream = vf.get_record_stream([key], 'unordered', True)
57
 
    record = stream.next()
58
 
    return record.get_bytes_as('fulltext')
59
 
 
60
 
 
61
 
def get_inventory_text(repo, revision_id):
62
 
    """Get the fulltext for the inventory at revision id"""
63
 
    repo.lock_read()
64
 
    try:
65
 
        return get_text(repo.inventories, (revision_id,))
66
 
    finally:
67
 
        repo.unlock()
68
56
 
69
57
 
70
58
class MockTree(object):
71
 
 
72
59
    def __init__(self):
73
60
        from bzrlib.inventory import InventoryDirectory, ROOT_ID
74
61
        object.__init__(self)
79
66
 
80
67
    inventory = property(lambda x:x)
81
68
 
82
 
    def all_file_ids(self):
83
 
        return set(self.paths.keys())
 
69
    def __iter__(self):
 
70
        return self.paths.iterkeys()
84
71
 
85
72
    def __getitem__(self, file_id):
86
73
        if file_id == self.root.file_id:
116
103
            ie = InventoryDirectory(file_id, name, parent_id)
117
104
        elif kind == 'file':
118
105
            ie = InventoryFile(file_id, name, parent_id)
119
 
            ie.text_sha1 = text_sha_1
120
 
            ie.text_size = text_size
121
106
        elif kind == 'symlink':
122
107
            ie = InventoryLink(file_id, name, parent_id)
123
108
        else:
124
109
            raise errors.BzrError('unknown kind %r' % kind)
 
110
        ie.text_sha1 = text_sha_1
 
111
        ie.text_size = text_size
125
112
        return ie
126
113
 
127
114
    def add_dir(self, file_id, path):
147
134
        result.seek(0,0)
148
135
        return result
149
136
 
150
 
    def get_file_revision(self, file_id):
151
 
        return self.inventory[file_id].revision
152
 
 
153
137
    def contents_stats(self, file_id):
154
138
        if file_id not in self.contents:
155
139
            return None, None
156
 
        text_sha1 = osutils.sha_file(self.get_file(file_id))
 
140
        text_sha1 = sha_file(self.get_file(file_id))
157
141
        return text_sha1, len(self.contents[file_id])
158
142
 
159
143
 
160
 
class BTreeTester(tests.TestCase):
 
144
class BTreeTester(TestCase):
161
145
    """A simple unittest tester for the BundleTree class."""
162
146
 
163
147
    def make_tree_1(self):
241
225
 
242
226
    def unified_diff(self, old, new):
243
227
        out = StringIO()
244
 
        diff.internal_diff("old", old, "new", new, out)
 
228
        internal_diff("old", old, "new", new, out)
245
229
        out.seek(0,0)
246
230
        return out.read()
247
231
 
335
319
            [inventory.ROOT_ID, 'a', 'b', 'd', 'e'])
336
320
 
337
321
 
338
 
class BundleTester1(tests.TestCaseWithTransport):
 
322
class BundleTester1(TestCaseWithTransport):
339
323
 
340
324
    def test_mismatched_bundle(self):
341
325
        format = bzrdir.BzrDirMetaFormat1()
382
366
    def make_branch_and_tree(self, path, format=None):
383
367
        if format is None:
384
368
            format = self.bzrdir_format()
385
 
        return tests.TestCaseWithTransport.make_branch_and_tree(
386
 
            self, path, format)
 
369
        return TestCaseWithTransport.make_branch_and_tree(self, path, format)
387
370
 
388
371
    def make_branch(self, path, format=None):
389
372
        if format is None:
390
373
            format = self.bzrdir_format()
391
 
        return tests.TestCaseWithTransport.make_branch(self, path, format)
 
374
        return TestCaseWithTransport.make_branch(self, path, format)
392
375
 
393
376
    def create_bundle_text(self, base_rev_id, rev_id):
394
377
        bundle_txt = StringIO()
497
480
                                 % (ancestor,))
498
481
 
499
482
                # Now check that the file contents are all correct
500
 
                for inventory_id in old.all_file_ids():
 
483
                for inventory_id in old:
501
484
                    try:
502
485
                        old_file = old.get_file(inventory_id)
503
486
                    except errors.NoSuchFile:
511
494
                old.unlock()
512
495
        if not _mod_revision.is_null(rev_id):
513
496
            rh = self.b1.revision_history()
514
 
            self.applyDeprecated(symbol_versioning.deprecated_in((2, 4, 0)),
515
 
                tree.branch.set_revision_history, rh[:rh.index(rev_id)+1])
 
497
            tree.branch.set_revision_history(rh[:rh.index(rev_id)+1])
516
498
            tree.update()
517
499
            delta = tree.changes_from(self.b1.repository.revision_tree(rev_id))
518
500
            self.assertFalse(delta.has_changed(),
539
521
            self.assert_(not repository.has_revision(rev.revision_id),
540
522
                'Revision {%s} present before applying bundle'
541
523
                % rev.revision_id)
542
 
        merge_bundle(info, to_tree, True, merge.Merge3Merger, False, False)
 
524
        merge_bundle(info, to_tree, True, Merge3Merger, False, False)
543
525
 
544
526
        for rev in info.real_revisions:
545
527
            self.assert_(repository.has_revision(rev.revision_id),
580
562
        self.tree1 = self.make_branch_and_tree('b1')
581
563
        self.b1 = self.tree1.branch
582
564
 
583
 
        self.build_tree_contents([('b1/one', 'one\n')])
584
 
        self.tree1.add('one', 'one-id')
585
 
        self.tree1.set_root_id('root-id')
 
565
        open('b1/one', 'wb').write('one\n')
 
566
        self.tree1.add('one')
586
567
        self.tree1.commit('add one', rev_id='a@cset-0-1')
587
568
 
588
569
        bundle = self.get_valid_bundle('null:', 'a@cset-0-1')
599
580
                , 'b1/sub/sub/'
600
581
                , 'b1/sub/sub/nonempty.txt'
601
582
                ])
602
 
        self.build_tree_contents([('b1/sub/sub/emptyfile.txt', ''),
603
 
                                  ('b1/dir/nolastnewline.txt', 'bloop')])
 
583
        open('b1/sub/sub/emptyfile.txt', 'wb').close()
 
584
        open('b1/dir/nolastnewline.txt', 'wb').write('bloop')
604
585
        tt = TreeTransform(self.tree1)
605
586
        tt.new_file('executable', tt.root, '#!/bin/sh\n', 'exe-1', True)
606
587
        tt.apply()
639
620
 
640
621
        bundle = self.get_valid_bundle('a@cset-0-2', 'a@cset-0-3')
641
622
        self.assertRaises((errors.TestamentMismatch,
642
 
            errors.VersionedFileInvalidChecksum,
643
 
            errors.BadBundle), self.get_invalid_bundle,
 
623
            errors.VersionedFileInvalidChecksum), self.get_invalid_bundle,
644
624
            'a@cset-0-2', 'a@cset-0-3')
645
625
        # Check a rollup bundle
646
626
        bundle = self.get_valid_bundle('null:', 'a@cset-0-3')
670
650
                          verbose=False)
671
651
        bundle = self.get_valid_bundle('a@cset-0-5', 'a@cset-0-6')
672
652
        other = self.get_checkout('a@cset-0-5')
673
 
        tree1_inv = get_inventory_text(self.tree1.branch.repository,
674
 
                                       'a@cset-0-5')
675
 
        tree2_inv = get_inventory_text(other.branch.repository,
676
 
                                       'a@cset-0-5')
 
653
        tree1_inv = self.tree1.branch.repository.get_inventory_xml(
 
654
            'a@cset-0-5')
 
655
        tree2_inv = other.branch.repository.get_inventory_xml('a@cset-0-5')
677
656
        self.assertEqualDiff(tree1_inv, tree2_inv)
678
657
        other.rename_one('sub/dir/nolastnewline.txt', 'sub/nolastnewline.txt')
679
658
        other.commit('rename file', rev_id='a@cset-0-6b')
682
661
                          verbose=False)
683
662
        bundle = self.get_valid_bundle('a@cset-0-6', 'a@cset-0-7')
684
663
 
685
 
    def _test_symlink_bundle(self, link_name, link_target, new_link_target):
686
 
        link_id = 'link-1'
687
 
 
688
 
        self.requireFeature(features.SymlinkFeature)
 
664
    def test_symlink_bundle(self):
 
665
        self.requireFeature(SymlinkFeature)
689
666
        self.tree1 = self.make_branch_and_tree('b1')
690
667
        self.b1 = self.tree1.branch
691
 
 
692
668
        tt = TreeTransform(self.tree1)
693
 
        tt.new_symlink(link_name, tt.root, link_target, link_id)
 
669
        tt.new_symlink('link', tt.root, 'bar/foo', 'link-1')
694
670
        tt.apply()
695
671
        self.tree1.commit('add symlink', rev_id='l@cset-0-1')
696
 
        bundle = self.get_valid_bundle('null:', 'l@cset-0-1')
697
 
        if getattr(bundle ,'revision_tree', None) is not None:
698
 
            # Not all bundle formats supports revision_tree
699
 
            bund_tree = bundle.revision_tree(self.b1.repository, 'l@cset-0-1')
700
 
            self.assertEqual(link_target, bund_tree.get_symlink_target(link_id))
701
 
 
 
672
        self.get_valid_bundle('null:', 'l@cset-0-1')
702
673
        tt = TreeTransform(self.tree1)
703
 
        trans_id = tt.trans_id_tree_file_id(link_id)
 
674
        trans_id = tt.trans_id_tree_file_id('link-1')
704
675
        tt.adjust_path('link2', tt.root, trans_id)
705
676
        tt.delete_contents(trans_id)
706
 
        tt.create_symlink(new_link_target, trans_id)
 
677
        tt.create_symlink('mars', trans_id)
707
678
        tt.apply()
708
679
        self.tree1.commit('rename and change symlink', rev_id='l@cset-0-2')
709
 
        bundle = self.get_valid_bundle('l@cset-0-1', 'l@cset-0-2')
710
 
        if getattr(bundle ,'revision_tree', None) is not None:
711
 
            # Not all bundle formats supports revision_tree
712
 
            bund_tree = bundle.revision_tree(self.b1.repository, 'l@cset-0-2')
713
 
            self.assertEqual(new_link_target,
714
 
                             bund_tree.get_symlink_target(link_id))
715
 
 
 
680
        self.get_valid_bundle('l@cset-0-1', 'l@cset-0-2')
716
681
        tt = TreeTransform(self.tree1)
717
 
        trans_id = tt.trans_id_tree_file_id(link_id)
 
682
        trans_id = tt.trans_id_tree_file_id('link-1')
718
683
        tt.delete_contents(trans_id)
719
684
        tt.create_symlink('jupiter', trans_id)
720
685
        tt.apply()
721
686
        self.tree1.commit('just change symlink target', rev_id='l@cset-0-3')
722
 
        bundle = self.get_valid_bundle('l@cset-0-2', 'l@cset-0-3')
723
 
 
 
687
        self.get_valid_bundle('l@cset-0-2', 'l@cset-0-3')
724
688
        tt = TreeTransform(self.tree1)
725
 
        trans_id = tt.trans_id_tree_file_id(link_id)
 
689
        trans_id = tt.trans_id_tree_file_id('link-1')
726
690
        tt.delete_contents(trans_id)
727
691
        tt.apply()
728
692
        self.tree1.commit('Delete symlink', rev_id='l@cset-0-4')
729
 
        bundle = self.get_valid_bundle('l@cset-0-3', 'l@cset-0-4')
730
 
 
731
 
    def test_symlink_bundle(self):
732
 
        self._test_symlink_bundle('link', 'bar/foo', 'mars')
733
 
 
734
 
    def test_unicode_symlink_bundle(self):
735
 
        self.requireFeature(features.UnicodeFilenameFeature)
736
 
        self._test_symlink_bundle(u'\N{Euro Sign}link',
737
 
                                  u'bar/\N{Euro Sign}foo',
738
 
                                  u'mars\N{Euro Sign}')
 
693
        self.get_valid_bundle('l@cset-0-3', 'l@cset-0-4')
739
694
 
740
695
    def test_binary_bundle(self):
741
696
        self.tree1 = self.make_branch_and_tree('b1')
839
794
        return bundle_file.getvalue()
840
795
 
841
796
    def test_unicode_bundle(self):
842
 
        self.requireFeature(features.UnicodeFilenameFeature)
843
797
        # Handle international characters
844
798
        os.mkdir('b1')
845
 
        f = open(u'b1/with Dod\N{Euro Sign}', 'wb')
 
799
        try:
 
800
            f = open(u'b1/with Dod\N{Euro Sign}', 'wb')
 
801
        except UnicodeEncodeError:
 
802
            raise TestSkipped("Filesystem doesn't support unicode")
846
803
 
847
804
        self.tree1 = self.make_branch_and_tree('b1')
848
805
        self.b1 = self.tree1.branch
886
843
 
887
844
    def test_whitespace_bundle(self):
888
845
        if sys.platform in ('win32', 'cygwin'):
889
 
            raise tests.TestSkipped('Windows doesn\'t support filenames'
890
 
                                    ' with tabs or trailing spaces')
 
846
            raise TestSkipped('Windows doesn\'t support filenames'
 
847
                              ' with tabs or trailing spaces')
891
848
        self.tree1 = self.make_branch_and_tree('b1')
892
849
        self.b1 = self.tree1.branch
893
850
 
1045
1002
        bundle = read_bundle(self.create_bundle_text('null:', 'rev2')[0])
1046
1003
        repo = self.make_repository('repo', format='dirstate-with-subtree')
1047
1004
        bundle.install_revisions(repo)
1048
 
        inv_text = repo._get_inventory_xml('rev2')
 
1005
        inv_text = repo.get_inventory_xml('rev2')
1049
1006
        self.assertNotContainsRe(inv_text, 'format="5"')
1050
1007
        self.assertContainsRe(inv_text, 'format="7"')
1051
1008
 
1071
1028
 
1072
1029
    def test_inv_hash_across_serializers(self):
1073
1030
        repo = self.make_repo_with_installed_revisions()
1074
 
        recorded_inv_sha1 = repo.get_revision('rev2').inventory_sha1
1075
 
        xml = repo._get_inventory_xml('rev2')
1076
 
        self.assertEqual(osutils.sha_string(xml), recorded_inv_sha1)
 
1031
        recorded_inv_sha1 = repo.get_inventory_sha1('rev2')
 
1032
        xml = repo.get_inventory_xml('rev2')
 
1033
        self.assertEqual(sha_string(xml), recorded_inv_sha1)
1077
1034
 
1078
1035
    def test_across_models_incompatible(self):
1079
1036
        tree = self.make_simple_tree('dirstate-with-subtree')
1082
1039
        try:
1083
1040
            bundle = read_bundle(self.create_bundle_text('null:', 'rev1')[0])
1084
1041
        except errors.IncompatibleBundleFormat:
1085
 
            raise tests.TestSkipped("Format 0.8 doesn't work with knit3")
 
1042
            raise TestSkipped("Format 0.8 doesn't work with knit3")
1086
1043
        repo = self.make_repository('repo', format='knit')
1087
1044
        bundle.install_revisions(repo)
1088
1045
 
1109
1066
        try:
1110
1067
            bundle = read_bundle(self.create_bundle_text('null:', 'rev1')[0])
1111
1068
        except errors.IncompatibleBundleFormat:
1112
 
            raise tests.TestSkipped("Format 0.8 doesn't work with knit3")
 
1069
            raise TestSkipped("Format 0.8 doesn't work with knit3")
1113
1070
        if isinstance(bundle, v09.BundleInfo09):
1114
 
            raise tests.TestSkipped("Format 0.9 doesn't work with subtrees")
 
1071
            raise TestSkipped("Format 0.9 doesn't work with subtrees")
1115
1072
        repo = self.make_repository('repo', format='knit')
1116
1073
        self.assertRaises(errors.IncompatibleRevision,
1117
1074
                          bundle.install_revisions, repo)
1124
1081
        try:
1125
1082
            self.tree1.commit('Revision/id/with/slashes', rev_id='rev/id')
1126
1083
        except ValueError:
1127
 
            raise tests.TestSkipped(
1128
 
                "Repository doesn't support revision ids with slashes")
 
1084
            raise TestSkipped("Repository doesn't support revision ids with"
 
1085
                              " slashes")
1129
1086
        bundle = self.get_valid_bundle('null:', 'rev/id')
1130
1087
 
1131
1088
    def test_skip_file(self):
1147
1104
        self.tree1.commit('rev3', rev_id='rev3')
1148
1105
        bundle = self.get_valid_bundle('reva', 'rev3')
1149
1106
        if getattr(bundle, 'get_bundle_reader', None) is None:
1150
 
            raise tests.TestSkipped('Bundle format cannot provide reader')
 
1107
            raise TestSkipped('Bundle format cannot provide reader')
1151
1108
        # be sure that file1 comes before file2
1152
1109
        for b, m, k, r, f in bundle.get_bundle_reader().iter_records():
1153
1110
            if f == 'file3-id':
1156
1113
        bundle.install_revisions(target.branch.repository)
1157
1114
 
1158
1115
 
1159
 
class V08BundleTester(BundleTester, tests.TestCaseWithTransport):
 
1116
class V08BundleTester(BundleTester, TestCaseWithTransport):
1160
1117
 
1161
1118
    format = '0.8'
1162
1119
 
1295
1252
        return format
1296
1253
 
1297
1254
 
1298
 
class V4BundleTester(BundleTester, tests.TestCaseWithTransport):
 
1255
class V4BundleTester(BundleTester, TestCaseWithTransport):
1299
1256
 
1300
1257
    format = '4'
1301
1258
 
1342
1299
        new_text = self.get_raw(StringIO(''.join(bundle_txt)))
1343
1300
        new_text = new_text.replace('<file file_id="exe-1"',
1344
1301
                                    '<file executable="y" file_id="exe-1"')
1345
 
        new_text = new_text.replace('B260', 'B275')
 
1302
        new_text = new_text.replace('B222', 'B237')
1346
1303
        bundle_txt = StringIO()
1347
1304
        bundle_txt.write(serializer._get_bundle_header('4'))
1348
1305
        bundle_txt.write('\n')
1418
1375
        branch = tree_a.branch
1419
1376
        repo_a = branch.repository
1420
1377
        tree_a.commit("base", allow_pointless=True, rev_id='A')
1421
 
        self.assertFalse(branch.repository.has_signature_for_revision_id('A'))
 
1378
        self.failIf(branch.repository.has_signature_for_revision_id('A'))
1422
1379
        try:
1423
1380
            from bzrlib.testament import Testament
1424
1381
            # monkey patch gpg signing mechanism
1448
1405
        install_bundle(repo_b, serializer.read(s))
1449
1406
 
1450
1407
 
1451
 
class V4_2aBundleTester(V4BundleTester):
 
1408
class V4WeaveBundleTester(V4BundleTester):
1452
1409
 
1453
1410
    def bzrdir_format(self):
1454
 
        return '2a'
1455
 
 
1456
 
    def get_invalid_bundle(self, base_rev_id, rev_id):
1457
 
        """Create a bundle from base_rev_id -> rev_id in built-in branch.
1458
 
        Munge the text so that it's invalid.
1459
 
 
1460
 
        :return: The in-memory bundle
1461
 
        """
1462
 
        from bzrlib.bundle import serializer
1463
 
        bundle_txt, rev_ids = self.create_bundle_text(base_rev_id, rev_id)
1464
 
        new_text = self.get_raw(StringIO(''.join(bundle_txt)))
1465
 
        # We are going to be replacing some text to set the executable bit on a
1466
 
        # file. Make sure the text replacement actually works correctly.
1467
 
        self.assertContainsRe(new_text, '(?m)B244\n\ni 1\n<inventory')
1468
 
        new_text = new_text.replace('<file file_id="exe-1"',
1469
 
                                    '<file executable="y" file_id="exe-1"')
1470
 
        new_text = new_text.replace('B244', 'B259')
1471
 
        bundle_txt = StringIO()
1472
 
        bundle_txt.write(serializer._get_bundle_header('4'))
1473
 
        bundle_txt.write('\n')
1474
 
        bundle_txt.write(new_text.encode('bz2'))
1475
 
        bundle_txt.seek(0)
1476
 
        bundle = read_bundle(bundle_txt)
1477
 
        self.valid_apply_bundle(base_rev_id, bundle)
1478
 
        return bundle
1479
 
 
1480
 
    def make_merged_branch(self):
1481
 
        builder = self.make_branch_builder('source')
1482
 
        builder.start_series()
1483
 
        builder.build_snapshot('a@cset-0-1', None, [
1484
 
            ('add', ('', 'root-id', 'directory', None)),
1485
 
            ('add', ('file', 'file-id', 'file', 'original content\n')),
1486
 
            ])
1487
 
        builder.build_snapshot('a@cset-0-2a', ['a@cset-0-1'], [
1488
 
            ('modify', ('file-id', 'new-content\n')),
1489
 
            ])
1490
 
        builder.build_snapshot('a@cset-0-2b', ['a@cset-0-1'], [
1491
 
            ('add', ('other-file', 'file2-id', 'file', 'file2-content\n')),
1492
 
            ])
1493
 
        builder.build_snapshot('a@cset-0-3', ['a@cset-0-2a', 'a@cset-0-2b'], [
1494
 
            ('add', ('other-file', 'file2-id', 'file', 'file2-content\n')),
1495
 
            ])
1496
 
        builder.finish_series()
1497
 
        self.b1 = builder.get_branch()
1498
 
        self.b1.lock_read()
1499
 
        self.addCleanup(self.b1.unlock)
1500
 
 
1501
 
    def make_bundle_just_inventories(self, base_revision_id,
1502
 
                                     target_revision_id,
1503
 
                                     revision_ids):
1504
 
        sio = StringIO()
1505
 
        writer = v4.BundleWriteOperation(base_revision_id, target_revision_id,
1506
 
                                         self.b1.repository, sio)
1507
 
        writer.bundle.begin()
1508
 
        writer._add_inventory_mpdiffs_from_serializer(revision_ids)
1509
 
        writer.bundle.end()
1510
 
        sio.seek(0)
1511
 
        return sio
1512
 
 
1513
 
    def test_single_inventory_multiple_parents_as_xml(self):
1514
 
        self.make_merged_branch()
1515
 
        sio = self.make_bundle_just_inventories('a@cset-0-1', 'a@cset-0-3',
1516
 
                                                ['a@cset-0-3'])
1517
 
        reader = v4.BundleReader(sio, stream_input=False)
1518
 
        records = list(reader.iter_records())
1519
 
        self.assertEqual(1, len(records))
1520
 
        (bytes, metadata, repo_kind, revision_id,
1521
 
         file_id) = records[0]
1522
 
        self.assertIs(None, file_id)
1523
 
        self.assertEqual('a@cset-0-3', revision_id)
1524
 
        self.assertEqual('inventory', repo_kind)
1525
 
        self.assertEqual({'parents': ['a@cset-0-2a', 'a@cset-0-2b'],
1526
 
                          'sha1': '09c53b0c4de0895e11a2aacc34fef60a6e70865c',
1527
 
                          'storage_kind': 'mpdiff',
1528
 
                         }, metadata)
1529
 
        # We should have an mpdiff that takes some lines from both parents.
1530
 
        self.assertEqualDiff(
1531
 
            'i 1\n'
1532
 
            '<inventory format="10" revision_id="a@cset-0-3">\n'
1533
 
            '\n'
1534
 
            'c 0 1 1 2\n'
1535
 
            'c 1 3 3 2\n', bytes)
1536
 
 
1537
 
    def test_single_inv_no_parents_as_xml(self):
1538
 
        self.make_merged_branch()
1539
 
        sio = self.make_bundle_just_inventories('null:', 'a@cset-0-1',
1540
 
                                                ['a@cset-0-1'])
1541
 
        reader = v4.BundleReader(sio, stream_input=False)
1542
 
        records = list(reader.iter_records())
1543
 
        self.assertEqual(1, len(records))
1544
 
        (bytes, metadata, repo_kind, revision_id,
1545
 
         file_id) = records[0]
1546
 
        self.assertIs(None, file_id)
1547
 
        self.assertEqual('a@cset-0-1', revision_id)
1548
 
        self.assertEqual('inventory', repo_kind)
1549
 
        self.assertEqual({'parents': [],
1550
 
                          'sha1': 'a13f42b142d544aac9b085c42595d304150e31a2',
1551
 
                          'storage_kind': 'mpdiff',
1552
 
                         }, metadata)
1553
 
        # We should have an mpdiff that takes some lines from both parents.
1554
 
        self.assertEqualDiff(
1555
 
            'i 4\n'
1556
 
            '<inventory format="10" revision_id="a@cset-0-1">\n'
1557
 
            '<directory file_id="root-id" name=""'
1558
 
                ' revision="a@cset-0-1" />\n'
1559
 
            '<file file_id="file-id" name="file" parent_id="root-id"'
1560
 
                ' revision="a@cset-0-1"'
1561
 
                ' text_sha1="09c2f8647e14e49e922b955c194102070597c2d1"'
1562
 
                ' text_size="17" />\n'
1563
 
            '</inventory>\n'
1564
 
            '\n', bytes)
1565
 
 
1566
 
    def test_multiple_inventories_as_xml(self):
1567
 
        self.make_merged_branch()
1568
 
        sio = self.make_bundle_just_inventories('a@cset-0-1', 'a@cset-0-3',
1569
 
            ['a@cset-0-2a', 'a@cset-0-2b', 'a@cset-0-3'])
1570
 
        reader = v4.BundleReader(sio, stream_input=False)
1571
 
        records = list(reader.iter_records())
1572
 
        self.assertEqual(3, len(records))
1573
 
        revision_ids = [rev_id for b, m, k, rev_id, f in records]
1574
 
        self.assertEqual(['a@cset-0-2a', 'a@cset-0-2b', 'a@cset-0-3'],
1575
 
                         revision_ids)
1576
 
        metadata_2a = records[0][1]
1577
 
        self.assertEqual({'parents': ['a@cset-0-1'],
1578
 
                          'sha1': '1e105886d62d510763e22885eec733b66f5f09bf',
1579
 
                          'storage_kind': 'mpdiff',
1580
 
                         }, metadata_2a)
1581
 
        metadata_2b = records[1][1]
1582
 
        self.assertEqual({'parents': ['a@cset-0-1'],
1583
 
                          'sha1': 'f03f12574bdb5ed2204c28636c98a8547544ccd8',
1584
 
                          'storage_kind': 'mpdiff',
1585
 
                         }, metadata_2b)
1586
 
        metadata_3 = records[2][1]
1587
 
        self.assertEqual({'parents': ['a@cset-0-2a', 'a@cset-0-2b'],
1588
 
                          'sha1': '09c53b0c4de0895e11a2aacc34fef60a6e70865c',
1589
 
                          'storage_kind': 'mpdiff',
1590
 
                         }, metadata_3)
1591
 
        bytes_2a = records[0][0]
1592
 
        self.assertEqualDiff(
1593
 
            'i 1\n'
1594
 
            '<inventory format="10" revision_id="a@cset-0-2a">\n'
1595
 
            '\n'
1596
 
            'c 0 1 1 1\n'
1597
 
            'i 1\n'
1598
 
            '<file file_id="file-id" name="file" parent_id="root-id"'
1599
 
                ' revision="a@cset-0-2a"'
1600
 
                ' text_sha1="50f545ff40e57b6924b1f3174b267ffc4576e9a9"'
1601
 
                ' text_size="12" />\n'
1602
 
            '\n'
1603
 
            'c 0 3 3 1\n', bytes_2a)
1604
 
        bytes_2b = records[1][0]
1605
 
        self.assertEqualDiff(
1606
 
            'i 1\n'
1607
 
            '<inventory format="10" revision_id="a@cset-0-2b">\n'
1608
 
            '\n'
1609
 
            'c 0 1 1 2\n'
1610
 
            'i 1\n'
1611
 
            '<file file_id="file2-id" name="other-file" parent_id="root-id"'
1612
 
                ' revision="a@cset-0-2b"'
1613
 
                ' text_sha1="b46c0c8ea1e5ef8e46fc8894bfd4752a88ec939e"'
1614
 
                ' text_size="14" />\n'
1615
 
            '\n'
1616
 
            'c 0 3 4 1\n', bytes_2b)
1617
 
        bytes_3 = records[2][0]
1618
 
        self.assertEqualDiff(
1619
 
            'i 1\n'
1620
 
            '<inventory format="10" revision_id="a@cset-0-3">\n'
1621
 
            '\n'
1622
 
            'c 0 1 1 2\n'
1623
 
            'c 1 3 3 2\n', bytes_3)
1624
 
 
1625
 
    def test_creating_bundle_preserves_chk_pages(self):
1626
 
        self.make_merged_branch()
1627
 
        target = self.b1.bzrdir.sprout('target',
1628
 
                                       revision_id='a@cset-0-2a').open_branch()
1629
 
        bundle_txt, rev_ids = self.create_bundle_text('a@cset-0-2a',
1630
 
                                                      'a@cset-0-3')
1631
 
        self.assertEqual(['a@cset-0-2b', 'a@cset-0-3'], rev_ids)
1632
 
        bundle = read_bundle(bundle_txt)
1633
 
        target.lock_write()
1634
 
        self.addCleanup(target.unlock)
1635
 
        install_bundle(target.repository, bundle)
1636
 
        inv1 = self.b1.repository.inventories.get_record_stream([
1637
 
            ('a@cset-0-3',)], 'unordered',
1638
 
            True).next().get_bytes_as('fulltext')
1639
 
        inv2 = target.repository.inventories.get_record_stream([
1640
 
            ('a@cset-0-3',)], 'unordered',
1641
 
            True).next().get_bytes_as('fulltext')
1642
 
        self.assertEqualDiff(inv1, inv2)
 
1411
        return 'metaweave'
1643
1412
 
1644
1413
 
1645
1414
class MungedBundleTester(object):
1694
1463
        self.check_valid(bundle)
1695
1464
 
1696
1465
 
1697
 
class MungedBundleTesterV09(tests.TestCaseWithTransport, MungedBundleTester):
 
1466
class MungedBundleTesterV09(TestCaseWithTransport, MungedBundleTester):
1698
1467
 
1699
1468
    format = '0.9'
1700
1469
 
1732
1501
        self.check_valid(bundle)
1733
1502
 
1734
1503
 
1735
 
class MungedBundleTesterV4(tests.TestCaseWithTransport, MungedBundleTester):
 
1504
class MungedBundleTesterV4(TestCaseWithTransport, MungedBundleTester):
1736
1505
 
1737
1506
    format = '4'
1738
1507
 
1739
1508
 
1740
 
class TestBundleWriterReader(tests.TestCase):
 
1509
class TestBundleWriterReader(TestCase):
1741
1510
 
1742
1511
    def test_roundtrip_record(self):
1743
1512
        fileobj = StringIO()
1808
1577
        self.assertRaises(errors.BadBundle, record_iter.next)
1809
1578
 
1810
1579
 
1811
 
class TestReadMergeableFromUrl(tests.TestCaseWithTransport):
 
1580
class TestReadMergeableFromUrl(TestCaseWithTransport):
1812
1581
 
1813
1582
    def test_read_mergeable_skips_local(self):
1814
1583
        """A local bundle named like the URL should not be read.
1820
1589
            def look_up(self, name, url):
1821
1590
                return 'source'
1822
1591
        directories.register('foo:', FooService, 'Testing directory service')
1823
 
        self.addCleanup(directories.remove, 'foo:')
 
1592
        self.addCleanup(lambda: directories.remove('foo:'))
1824
1593
        self.build_tree_contents([('./foo:bar', out.getvalue())])
1825
1594
        self.assertRaises(errors.NotABundle, read_mergeable_from_url,
1826
1595
                          'foo:bar')
1827
1596
 
1828
 
    def test_infinite_redirects_are_not_a_bundle(self):
1829
 
        """If a URL causes TooManyRedirections then NotABundle is raised.
1830
 
        """
1831
 
        from bzrlib.tests.blackbox.test_push import RedirectingMemoryServer
1832
 
        server = RedirectingMemoryServer()
1833
 
        self.start_server(server)
1834
 
        url = server.get_url() + 'infinite-loop'
1835
 
        self.assertRaises(errors.NotABundle, read_mergeable_from_url, url)
1836
 
 
1837
1597
    def test_smart_server_connection_reset(self):
1838
1598
        """If a smart server connection fails during the attempt to read a
1839
1599
        bundle, then the ConnectionReset error should be propagated.
1840
1600
        """
1841
1601
        # Instantiate a server that will provoke a ConnectionReset
1842
1602
        sock_server = _DisconnectingTCPServer()
1843
 
        self.start_server(sock_server)
 
1603
        sock_server.setUp()
 
1604
        self.addCleanup(sock_server.tearDown)
1844
1605
        # We don't really care what the url is since the server will close the
1845
1606
        # connection without interpreting it
1846
1607
        url = sock_server.get_url()
1850
1611
class _DisconnectingTCPServer(object):
1851
1612
    """A TCP server that immediately closes any connection made to it."""
1852
1613
 
1853
 
    def start_server(self):
 
1614
    def setUp(self):
1854
1615
        self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
1855
1616
        self.sock.bind(('127.0.0.1', 0))
1856
1617
        self.sock.listen(1)
1868
1629
    def get_url(self):
1869
1630
        return 'bzr://127.0.0.1:%d/' % (self.port,)
1870
1631
 
1871
 
    def stop_server(self):
 
1632
    def tearDown(self):
1872
1633
        try:
1873
1634
            # make sure the thread dies by connecting to the listening socket,
1874
1635
            # just in case the test failed to do so.
1879
1640
            pass
1880
1641
        self.sock.close()
1881
1642
        self.thread.join()
 
1643