← 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: Patch Queue Manager
  • Date: 2015-12-17 18:39:00 UTC
  • mfrom: (6606.1.2 fix-float)
  • Revision ID: pqm@pqm.ubuntu.com-20151217183900-0719du2uv1kwu3lc
(vila) Inline testtools private method to fix an issue in xenial (the
 private implementation has changed in an backward incompatible way).
 (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bundle.py
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,
28
27
    merge,
29
28
    osutils,
30
29
    revision as _mod_revision,
31
 
    symbol_versioning,
32
30
    tests,
33
31
    treebuilder,
34
32
    )
42
40
from bzrlib.bundle.serializer.v4 import BundleSerializerV4
43
41
from bzrlib.repofmt import knitrepo
44
42
from bzrlib.tests import (
 
43
    features,
 
44
    test_commit,
45
45
    test_read_bundle,
46
 
    test_commit,
 
46
    test_server,
47
47
    )
48
48
from bzrlib.transform import TreeTransform
49
 
from bzrlib.tests import (
50
 
    features,
51
 
    )
52
49
 
53
50
 
54
51
def get_text(vf, key):
78
75
        self.root = InventoryDirectory(ROOT_ID, '', None)
79
76
 
80
77
    inventory = property(lambda x:x)
 
78
    root_inventory = property(lambda x:x)
 
79
 
 
80
    def get_root_id(self):
 
81
        return self.root.file_id
81
82
 
82
83
    def all_file_ids(self):
83
84
        return set(self.paths.keys())
84
85
 
 
86
    def is_executable(self, file_id):
 
87
        # Not all the files are executable.
 
88
        return False
 
89
 
85
90
    def __getitem__(self, file_id):
86
91
        if file_id == self.root.file_id:
87
92
            return self.root
98
103
        for path, file_id in self.ids.iteritems():
99
104
            yield path, self[file_id]
100
105
 
101
 
    def get_file_kind(self, file_id):
 
106
    def kind(self, file_id):
102
107
        if file_id in self.contents:
103
108
            kind = 'file'
104
109
        else:
106
111
        return kind
107
112
 
108
113
    def make_entry(self, file_id, path):
109
 
        from bzrlib.inventory import (InventoryEntry, InventoryFile
110
 
                                    , InventoryDirectory, InventoryLink)
 
114
        from bzrlib.inventory import (InventoryFile , InventoryDirectory,
 
115
            InventoryLink)
111
116
        name = os.path.basename(path)
112
 
        kind = self.get_file_kind(file_id)
 
117
        kind = self.kind(file_id)
113
118
        parent_id = self.parent_id(file_id)
114
119
        text_sha_1, text_size = self.contents_stats(file_id)
115
120
        if kind == 'directory':
150
155
    def get_file_revision(self, file_id):
151
156
        return self.inventory[file_id].revision
152
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
 
153
164
    def contents_stats(self, file_id):
154
165
        if file_id not in self.contents:
155
166
            return None, None
318
329
        self.assertTrue(btree.path2id("grandparent/parent/file") is None)
319
330
 
320
331
    def sorted_ids(self, tree):
321
 
        ids = list(tree)
 
332
        ids = list(tree.all_file_ids())
322
333
        ids.sort()
323
334
        return ids
324
335
 
510
521
                new.unlock()
511
522
                old.unlock()
512
523
        if not _mod_revision.is_null(rev_id):
513
 
            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])
 
524
            tree.branch.generate_revision_history(rev_id)
516
525
            tree.update()
517
526
            delta = tree.changes_from(self.b1.repository.revision_tree(rev_id))
518
527
            self.assertFalse(delta.has_changed(),
654
663
        bundle = self.get_valid_bundle('null:', 'a@cset-0-4')
655
664
 
656
665
        # Modified files
657
 
        open('b1/sub/dir/WithCaps.txt', 'ab').write('\nAdding some text\n')
658
 
        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(
659
668
             '\r\nAdding some\r\nDOS format lines\r\n')
660
 
        open('b1/sub/dir/nolastnewline.txt', 'ab').write('\n')
 
669
        with open('b1/sub/dir/nolastnewline.txt', 'ab') as f: f.write('\n')
661
670
        self.tree1.rename_one('sub/dir/ pre space',
662
671
                              'sub/ start space')
663
672
        self.tree1.commit('Modified files', rev_id='a@cset-0-5')
812
821
        self.tree1 = self.make_branch_and_tree('b1')
813
822
        self.b1 = self.tree1.branch
814
823
 
815
 
        open('b1/one', 'wb').write('one\n')
 
824
        with open('b1/one', 'wb') as f: f.write('one\n')
816
825
        self.tree1.add('one')
817
826
        self.tree1.commit('add file', rev_id='a@cset-0-1')
818
 
        open('b1/one', 'wb').write('two\n')
 
827
        with open('b1/one', 'wb') as f: f.write('two\n')
819
828
        self.tree1.commit('modify', rev_id='a@cset-0-2')
820
 
        open('b1/one', 'wb').write('three\n')
 
829
        with open('b1/one', 'wb') as f: f.write('three\n')
821
830
        self.tree1.commit('modify', rev_id='a@cset-0-3')
822
831
        bundle_file = StringIO()
823
832
        rev_ids = write_bundle(self.tree1.branch.repository, 'a@cset-0-3',
902
911
        bundle = self.get_valid_bundle('null:', 'white-1')
903
912
 
904
913
        # Modified
905
 
        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')
906
915
        self.tree1.commit('add text', rev_id='white-2')
907
916
 
908
917
        bundle = self.get_valid_bundle('white-1', 'white-2')
950
959
        self.tree1.commit('message', rev_id='revid1')
951
960
        bundle = self.get_valid_bundle('null:', 'revid1')
952
961
        tree = self.get_bundle_tree(bundle, 'revid1')
953
 
        self.assertEqual('revid1', tree.inventory.root.revision)
 
962
        root_revision = tree.get_file_revision(tree.get_root_id())
 
963
        self.assertEqual('revid1', root_revision)
954
964
 
955
965
    def test_install_revisions(self):
956
966
        self.tree1 = self.make_branch_and_tree('b1')
1423
1433
            from bzrlib.testament import Testament
1424
1434
            # monkey patch gpg signing mechanism
1425
1435
            bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
1426
 
            new_config = test_commit.MustSignConfig(branch)
1427
 
            commit.Commit(config=new_config).commit(message="base",
 
1436
            new_config = test_commit.MustSignConfig()
 
1437
            commit.Commit(config_stack=new_config).commit(message="base",
1428
1438
                                                    allow_pointless=True,
1429
1439
                                                    rev_id='B',
1430
1440
                                                    working_tree=tree_a)
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