← 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 bzr.dev, update to use new hooks.

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
17
17
from cStringIO import StringIO
18
18
import os
19
19
import socket
 
20
import SocketServer
20
21
import sys
21
22
import threading
22
23
 
27
28
    inventory,
28
29
    merge,
29
30
    osutils,
30
 
    repository,
31
31
    revision as _mod_revision,
32
32
    tests,
33
33
    treebuilder,
35
35
from bzrlib.bundle import read_mergeable_from_url
36
36
from bzrlib.bundle.apply_bundle import install_bundle, merge_bundle
37
37
from bzrlib.bundle.bundle_data import BundleTree
38
 
from bzrlib.bzrdir import BzrDir
39
38
from bzrlib.directory_service import directories
40
39
from bzrlib.bundle.serializer import write_bundle, read_bundle, v09, v4
41
40
from bzrlib.bundle.serializer.v08 import BundleSerializerV08
42
41
from bzrlib.bundle.serializer.v09 import BundleSerializerV09
43
42
from bzrlib.bundle.serializer.v4 import BundleSerializerV4
44
 
from bzrlib.branch import Branch
45
43
from bzrlib.repofmt import knitrepo
46
44
from bzrlib.tests import (
 
45
    features,
 
46
    test_commit,
47
47
    test_read_bundle,
48
 
    test_commit,
 
48
    test_server,
49
49
    )
50
50
from bzrlib.transform import TreeTransform
51
51
 
67
67
 
68
68
 
69
69
class MockTree(object):
 
70
 
70
71
    def __init__(self):
71
72
        from bzrlib.inventory import InventoryDirectory, ROOT_ID
72
73
        object.__init__(self)
77
78
 
78
79
    inventory = property(lambda x:x)
79
80
 
80
 
    def __iter__(self):
81
 
        return self.paths.iterkeys()
 
81
    def all_file_ids(self):
 
82
        return set(self.paths.keys())
82
83
 
83
84
    def __getitem__(self, file_id):
84
85
        if file_id == self.root.file_id:
145
146
        result.seek(0,0)
146
147
        return result
147
148
 
 
149
    def get_file_revision(self, file_id):
 
150
        return self.inventory[file_id].revision
 
151
 
148
152
    def contents_stats(self, file_id):
149
153
        if file_id not in self.contents:
150
154
            return None, None
492
496
                                 % (ancestor,))
493
497
 
494
498
                # Now check that the file contents are all correct
495
 
                for inventory_id in old:
 
499
                for inventory_id in old.all_file_ids():
496
500
                    try:
497
501
                        old_file = old.get_file(inventory_id)
498
502
                    except errors.NoSuchFile:
505
509
                new.unlock()
506
510
                old.unlock()
507
511
        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])
 
512
            tree.branch.generate_revision_history(rev_id)
510
513
            tree.update()
511
514
            delta = tree.changes_from(self.b1.repository.revision_tree(rev_id))
512
515
            self.assertFalse(delta.has_changed(),
679
682
    def _test_symlink_bundle(self, link_name, link_target, new_link_target):
680
683
        link_id = 'link-1'
681
684
 
682
 
        self.requireFeature(tests.SymlinkFeature)
 
685
        self.requireFeature(features.SymlinkFeature)
683
686
        self.tree1 = self.make_branch_and_tree('b1')
684
687
        self.b1 = self.tree1.branch
685
688
 
726
729
        self._test_symlink_bundle('link', 'bar/foo', 'mars')
727
730
 
728
731
    def test_unicode_symlink_bundle(self):
729
 
        self.requireFeature(tests.UnicodeFilenameFeature)
 
732
        self.requireFeature(features.UnicodeFilenameFeature)
730
733
        self._test_symlink_bundle(u'\N{Euro Sign}link',
731
734
                                  u'bar/\N{Euro Sign}foo',
732
735
                                  u'mars\N{Euro Sign}')
833
836
        return bundle_file.getvalue()
834
837
 
835
838
    def test_unicode_bundle(self):
836
 
        self.requireFeature(tests.UnicodeFilenameFeature)
 
839
        self.requireFeature(features.UnicodeFilenameFeature)
837
840
        # Handle international characters
838
841
        os.mkdir('b1')
839
842
        f = open(u'b1/with Dod\N{Euro Sign}', 'wb')
1412
1415
        branch = tree_a.branch
1413
1416
        repo_a = branch.repository
1414
1417
        tree_a.commit("base", allow_pointless=True, rev_id='A')
1415
 
        self.failIf(branch.repository.has_signature_for_revision_id('A'))
 
1418
        self.assertFalse(branch.repository.has_signature_for_revision_id('A'))
1416
1419
        try:
1417
1420
            from bzrlib.testament import Testament
1418
1421
            # monkey patch gpg signing mechanism
1442
1445
        install_bundle(repo_b, serializer.read(s))
1443
1446
 
1444
1447
 
1445
 
class V4WeaveBundleTester(V4BundleTester):
1446
 
 
1447
 
    def bzrdir_format(self):
1448
 
        return 'metaweave'
1449
 
 
1450
 
 
1451
1448
class V4_2aBundleTester(V4BundleTester):
1452
1449
 
1453
1450
    def bzrdir_format(self):
1839
1836
        bundle, then the ConnectionReset error should be propagated.
1840
1837
        """
1841
1838
        # Instantiate a server that will provoke a ConnectionReset
1842
 
        sock_server = _DisconnectingTCPServer()
 
1839
        sock_server = DisconnectingServer()
1843
1840
        self.start_server(sock_server)
1844
1841
        # We don't really care what the url is since the server will close the
1845
1842
        # connection without interpreting it
1847
1844
        self.assertRaises(errors.ConnectionReset, read_mergeable_from_url, url)
1848
1845
 
1849
1846
 
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()
 
1847
class DisconnectingHandler(SocketServer.BaseRequestHandler):
 
1848
    """A request handler that immediately closes any connection made to it."""
 
1849
 
 
1850
    def handle(self):
 
1851
        self.request.close()
 
1852
 
 
1853
 
 
1854
class DisconnectingServer(test_server.TestingTCPServerInAThread):
 
1855
 
 
1856
    def __init__(self):
 
1857
        super(DisconnectingServer, self).__init__(
 
1858
            ('127.0.0.1', 0),
 
1859
            test_server.TestingTCPServer,
 
1860
            DisconnectingHandler)
1867
1861
 
1868
1862
    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()
 
1863
        """Return the url of the server"""
 
1864
        return "bzr://%s:%d/" % self.server.server_address