← 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: Kit Randel
  • Date: 2014-12-15 20:24:42 UTC
  • mto: This revision was merged to the branch mainline in revision 6602.
  • Revision ID: kit.randel@canonical.com-20141215202442-usf2ixhypqg8yh6q
added a note for bug-1400567 to the 2.7b release notes

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bundle.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005-2011 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
16
16
 
17
17
from cStringIO import StringIO
18
18
import os
19
 
import socket
 
19
import SocketServer
20
20
import sys
21
 
import threading
22
21
 
23
22
from bzrlib import (
24
23
    bzrdir,
27
26
    inventory,
28
27
    merge,
29
28
    osutils,
30
 
    repository,
31
29
    revision as _mod_revision,
32
30
    tests,
33
31
    treebuilder,
35
33
from bzrlib.bundle import read_mergeable_from_url
36
34
from bzrlib.bundle.apply_bundle import install_bundle, merge_bundle
37
35
from bzrlib.bundle.bundle_data import BundleTree
38
 
from bzrlib.bzrdir import BzrDir
39
36
from bzrlib.directory_service import directories
40
37
from bzrlib.bundle.serializer import write_bundle, read_bundle, v09, v4
41
38
from bzrlib.bundle.serializer.v08 import BundleSerializerV08
42
39
from bzrlib.bundle.serializer.v09 import BundleSerializerV09
43
40
from bzrlib.bundle.serializer.v4 import BundleSerializerV4
44
 
from bzrlib.branch import Branch
45
41
from bzrlib.repofmt import knitrepo
46
42
from bzrlib.tests import (
 
43
    features,
 
44
    test_commit,
47
45
    test_read_bundle,
48
 
    test_commit,
 
46
    test_server,
49
47
    )
50
48
from bzrlib.transform import TreeTransform
51
49
 
67
65
 
68
66
 
69
67
class MockTree(object):
 
68
 
70
69
    def __init__(self):
71
70
        from bzrlib.inventory import InventoryDirectory, ROOT_ID
72
71
        object.__init__(self)
76
75
        self.root = InventoryDirectory(ROOT_ID, '', None)
77
76
 
78
77
    inventory = property(lambda x:x)
79
 
 
80
 
    def __iter__(self):
81
 
        return self.paths.iterkeys()
 
78
    root_inventory = property(lambda x:x)
 
79
 
 
80
    def get_root_id(self):
 
81
        return self.root.file_id
 
82
 
 
83
    def all_file_ids(self):
 
84
        return set(self.paths.keys())
 
85
 
 
86
    def is_executable(self, file_id):
 
87
        # Not all the files are executable.
 
88
        return False
82
89
 
83
90
    def __getitem__(self, file_id):
84
91
        if file_id == self.root.file_id:
96
103
        for path, file_id in self.ids.iteritems():
97
104
            yield path, self[file_id]
98
105
 
99
 
    def get_file_kind(self, file_id):
 
106
    def kind(self, file_id):
100
107
        if file_id in self.contents:
101
108
            kind = 'file'
102
109
        else:
104
111
        return kind
105
112
 
106
113
    def make_entry(self, file_id, path):
107
 
        from bzrlib.inventory import (InventoryEntry, InventoryFile
108
 
                                    , InventoryDirectory, InventoryLink)
 
114
        from bzrlib.inventory import (InventoryFile , InventoryDirectory,
 
115
            InventoryLink)
109
116
        name = os.path.basename(path)
110
 
        kind = self.get_file_kind(file_id)
 
117
        kind = self.kind(file_id)
111
118
        parent_id = self.parent_id(file_id)
112
119
        text_sha_1, text_size = self.contents_stats(file_id)
113
120
        if kind == 'directory':
145
152
        result.seek(0,0)
146
153
        return result
147
154
 
 
155
    def get_file_revision(self, file_id):
 
156
        return self.inventory[file_id].revision
 
157
 
 
158
    def get_file_size(self, file_id):
 
159
        return self.inventory[file_id].text_size
 
160
 
 
161
    def get_file_sha1(self, file_id):
 
162
        return self.inventory[file_id].text_sha1
 
163
 
148
164
    def contents_stats(self, file_id):
149
165
        if file_id not in self.contents:
150
166
            return None, None
313
329
        self.assertTrue(btree.path2id("grandparent/parent/file") is None)
314
330
 
315
331
    def sorted_ids(self, tree):
316
 
        ids = list(tree)
 
332
        ids = list(tree.all_file_ids())
317
333
        ids.sort()
318
334
        return ids
319
335
 
492
508
                                 % (ancestor,))
493
509
 
494
510
                # Now check that the file contents are all correct
495
 
                for inventory_id in old:
 
511
                for inventory_id in old.all_file_ids():
496
512
                    try:
497
513
                        old_file = old.get_file(inventory_id)
498
514
                    except errors.NoSuchFile:
505
521
                new.unlock()
506
522
                old.unlock()
507
523
        if not _mod_revision.is_null(rev_id):
508
 
            rh = self.b1.revision_history()
509
 
            tree.branch.set_revision_history(rh[:rh.index(rev_id)+1])
 
524
            tree.branch.generate_revision_history(rev_id)
510
525
            tree.update()
511
526
            delta = tree.changes_from(self.b1.repository.revision_tree(rev_id))
512
527
            self.assertFalse(delta.has_changed(),
648
663
        bundle = self.get_valid_bundle('null:', 'a@cset-0-4')
649
664
 
650
665
        # Modified files
651
 
        open('b1/sub/dir/WithCaps.txt', 'ab').write('\nAdding some text\n')
652
 
        open('b1/sub/dir/ pre space', 'ab').write(
 
666
        with open('b1/sub/dir/WithCaps.txt', 'ab') as f: f.write('\nAdding some text\n')
 
667
        with open('b1/sub/dir/ pre space', 'ab') as f: f.write(
653
668
             '\r\nAdding some\r\nDOS format lines\r\n')
654
 
        open('b1/sub/dir/nolastnewline.txt', 'ab').write('\n')
 
669
        with open('b1/sub/dir/nolastnewline.txt', 'ab') as f: f.write('\n')
655
670
        self.tree1.rename_one('sub/dir/ pre space',
656
671
                              'sub/ start space')
657
672
        self.tree1.commit('Modified files', rev_id='a@cset-0-5')
679
694
    def _test_symlink_bundle(self, link_name, link_target, new_link_target):
680
695
        link_id = 'link-1'
681
696
 
682
 
        self.requireFeature(tests.SymlinkFeature)
 
697
        self.requireFeature(features.SymlinkFeature)
683
698
        self.tree1 = self.make_branch_and_tree('b1')
684
699
        self.b1 = self.tree1.branch
685
700
 
726
741
        self._test_symlink_bundle('link', 'bar/foo', 'mars')
727
742
 
728
743
    def test_unicode_symlink_bundle(self):
729
 
        self.requireFeature(tests.UnicodeFilenameFeature)
 
744
        self.requireFeature(features.UnicodeFilenameFeature)
730
745
        self._test_symlink_bundle(u'\N{Euro Sign}link',
731
746
                                  u'bar/\N{Euro Sign}foo',
732
747
                                  u'mars\N{Euro Sign}')
806
821
        self.tree1 = self.make_branch_and_tree('b1')
807
822
        self.b1 = self.tree1.branch
808
823
 
809
 
        open('b1/one', 'wb').write('one\n')
 
824
        with open('b1/one', 'wb') as f: f.write('one\n')
810
825
        self.tree1.add('one')
811
826
        self.tree1.commit('add file', rev_id='a@cset-0-1')
812
 
        open('b1/one', 'wb').write('two\n')
 
827
        with open('b1/one', 'wb') as f: f.write('two\n')
813
828
        self.tree1.commit('modify', rev_id='a@cset-0-2')
814
 
        open('b1/one', 'wb').write('three\n')
 
829
        with open('b1/one', 'wb') as f: f.write('three\n')
815
830
        self.tree1.commit('modify', rev_id='a@cset-0-3')
816
831
        bundle_file = StringIO()
817
832
        rev_ids = write_bundle(self.tree1.branch.repository, 'a@cset-0-3',
833
848
        return bundle_file.getvalue()
834
849
 
835
850
    def test_unicode_bundle(self):
836
 
        self.requireFeature(tests.UnicodeFilenameFeature)
 
851
        self.requireFeature(features.UnicodeFilenameFeature)
837
852
        # Handle international characters
838
853
        os.mkdir('b1')
839
854
        f = open(u'b1/with Dod\N{Euro Sign}', 'wb')
896
911
        bundle = self.get_valid_bundle('null:', 'white-1')
897
912
 
898
913
        # Modified
899
 
        open('b1/trailing space ', 'ab').write('add some text\n')
 
914
        with open('b1/trailing space ', 'ab') as f: f.write('add some text\n')
900
915
        self.tree1.commit('add text', rev_id='white-2')
901
916
 
902
917
        bundle = self.get_valid_bundle('white-1', 'white-2')
944
959
        self.tree1.commit('message', rev_id='revid1')
945
960
        bundle = self.get_valid_bundle('null:', 'revid1')
946
961
        tree = self.get_bundle_tree(bundle, 'revid1')
947
 
        self.assertEqual('revid1', tree.inventory.root.revision)
 
962
        root_revision = tree.get_file_revision(tree.get_root_id())
 
963
        self.assertEqual('revid1', root_revision)
948
964
 
949
965
    def test_install_revisions(self):
950
966
        self.tree1 = self.make_branch_and_tree('b1')
1412
1428
        branch = tree_a.branch
1413
1429
        repo_a = branch.repository
1414
1430
        tree_a.commit("base", allow_pointless=True, rev_id='A')
1415
 
        self.failIf(branch.repository.has_signature_for_revision_id('A'))
 
1431
        self.assertFalse(branch.repository.has_signature_for_revision_id('A'))
1416
1432
        try:
1417
1433
            from bzrlib.testament import Testament
1418
1434
            # monkey patch gpg signing mechanism
1419
1435
            bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
1420
 
            new_config = test_commit.MustSignConfig(branch)
1421
 
            commit.Commit(config=new_config).commit(message="base",
 
1436
            new_config = test_commit.MustSignConfig()
 
1437
            commit.Commit(config_stack=new_config).commit(message="base",
1422
1438
                                                    allow_pointless=True,
1423
1439
                                                    rev_id='B',
1424
1440
                                                    working_tree=tree_a)
1442
1458
        install_bundle(repo_b, serializer.read(s))
1443
1459
 
1444
1460
 
1445
 
class V4WeaveBundleTester(V4BundleTester):
1446
 
 
1447
 
    def bzrdir_format(self):
1448
 
        return 'metaweave'
1449
 
 
1450
 
 
1451
1461
class V4_2aBundleTester(V4BundleTester):
1452
1462
 
1453
1463
    def bzrdir_format(self):
1839
1849
        bundle, then the ConnectionReset error should be propagated.
1840
1850
        """
1841
1851
        # Instantiate a server that will provoke a ConnectionReset
1842
 
        sock_server = _DisconnectingTCPServer()
 
1852
        sock_server = DisconnectingServer()
1843
1853
        self.start_server(sock_server)
1844
1854
        # We don't really care what the url is since the server will close the
1845
1855
        # connection without interpreting it
1847
1857
        self.assertRaises(errors.ConnectionReset, read_mergeable_from_url, url)
1848
1858
 
1849
1859
 
1850
 
class _DisconnectingTCPServer(object):
1851
 
    """A TCP server that immediately closes any connection made to it."""
1852
 
 
1853
 
    def start_server(self):
1854
 
        self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
1855
 
        self.sock.bind(('127.0.0.1', 0))
1856
 
        self.sock.listen(1)
1857
 
        self.port = self.sock.getsockname()[1]
1858
 
        self.thread = threading.Thread(
1859
 
            name='%s (port %d)' % (self.__class__.__name__, self.port),
1860
 
            target=self.accept_and_close)
1861
 
        self.thread.start()
1862
 
 
1863
 
    def accept_and_close(self):
1864
 
        conn, addr = self.sock.accept()
1865
 
        conn.shutdown(socket.SHUT_RDWR)
1866
 
        conn.close()
 
1860
class DisconnectingHandler(SocketServer.BaseRequestHandler):
 
1861
    """A request handler that immediately closes any connection made to it."""
 
1862
 
 
1863
    def handle(self):
 
1864
        self.request.close()
 
1865
 
 
1866
 
 
1867
class DisconnectingServer(test_server.TestingTCPServerInAThread):
 
1868
 
 
1869
    def __init__(self):
 
1870
        super(DisconnectingServer, self).__init__(
 
1871
            ('127.0.0.1', 0),
 
1872
            test_server.TestingTCPServer,
 
1873
            DisconnectingHandler)
1867
1874
 
1868
1875
    def get_url(self):
1869
 
        return 'bzr://127.0.0.1:%d/' % (self.port,)
1870
 
 
1871
 
    def stop_server(self):
1872
 
        try:
1873
 
            # make sure the thread dies by connecting to the listening socket,
1874
 
            # just in case the test failed to do so.
1875
 
            conn = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
1876
 
            conn.connect(self.sock.getsockname())
1877
 
            conn.close()
1878
 
        except socket.error:
1879
 
            pass
1880
 
        self.sock.close()
1881
 
        self.thread.join()
 
1876
        """Return the url of the server"""
 
1877
        return "bzr://%s:%d/" % self.server.server_address