← 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-11-25 07:27:43 UTC
  • mto: This revision was merged to the branch mainline in revision 4825.
  • Revision ID: andrew.bennetts@canonical.com-20091125072743-v6sv4m2mkt9iyslp
https://launchpad.net/bugs/426662
Terminate SSHSubprocesses when no refs to them are left, in case .close is never called.

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
27
27
    inventory,
28
28
    merge,
29
29
    osutils,
 
30
    repository,
30
31
    revision as _mod_revision,
31
 
    symbol_versioning,
32
32
    tests,
33
33
    treebuilder,
34
34
    )
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
38
39
from bzrlib.directory_service import directories
39
40
from bzrlib.bundle.serializer import write_bundle, read_bundle, v09, v4
40
41
from bzrlib.bundle.serializer.v08 import BundleSerializerV08
41
42
from bzrlib.bundle.serializer.v09 import BundleSerializerV09
42
43
from bzrlib.bundle.serializer.v4 import BundleSerializerV4
 
44
from bzrlib.branch import Branch
43
45
from bzrlib.repofmt import knitrepo
44
46
from bzrlib.tests import (
45
47
    test_read_bundle,
65
67
 
66
68
 
67
69
class MockTree(object):
68
 
 
69
70
    def __init__(self):
70
71
        from bzrlib.inventory import InventoryDirectory, ROOT_ID
71
72
        object.__init__(self)
76
77
 
77
78
    inventory = property(lambda x:x)
78
79
 
79
 
    def all_file_ids(self):
80
 
        return set(self.paths.keys())
 
80
    def __iter__(self):
 
81
        return self.paths.iterkeys()
81
82
 
82
83
    def __getitem__(self, file_id):
83
84
        if file_id == self.root.file_id:
113
114
            ie = InventoryDirectory(file_id, name, parent_id)
114
115
        elif kind == 'file':
115
116
            ie = InventoryFile(file_id, name, parent_id)
116
 
            ie.text_sha1 = text_sha_1
117
 
            ie.text_size = text_size
118
117
        elif kind == 'symlink':
119
118
            ie = InventoryLink(file_id, name, parent_id)
120
119
        else:
121
120
            raise errors.BzrError('unknown kind %r' % kind)
 
121
        ie.text_sha1 = text_sha_1
 
122
        ie.text_size = text_size
122
123
        return ie
123
124
 
124
125
    def add_dir(self, file_id, path):
144
145
        result.seek(0,0)
145
146
        return result
146
147
 
147
 
    def get_file_revision(self, file_id):
148
 
        return self.inventory[file_id].revision
149
 
 
150
148
    def contents_stats(self, file_id):
151
149
        if file_id not in self.contents:
152
150
            return None, None
494
492
                                 % (ancestor,))
495
493
 
496
494
                # Now check that the file contents are all correct
497
 
                for inventory_id in old.all_file_ids():
 
495
                for inventory_id in old:
498
496
                    try:
499
497
                        old_file = old.get_file(inventory_id)
500
498
                    except errors.NoSuchFile:
508
506
                old.unlock()
509
507
        if not _mod_revision.is_null(rev_id):
510
508
            rh = self.b1.revision_history()
511
 
            self.applyDeprecated(symbol_versioning.deprecated_in((2, 4, 0)),
512
 
                tree.branch.set_revision_history, rh[:rh.index(rev_id)+1])
 
509
            tree.branch.set_revision_history(rh[:rh.index(rev_id)+1])
513
510
            tree.update()
514
511
            delta = tree.changes_from(self.b1.repository.revision_tree(rev_id))
515
512
            self.assertFalse(delta.has_changed(),
1042
1039
        bundle = read_bundle(self.create_bundle_text('null:', 'rev2')[0])
1043
1040
        repo = self.make_repository('repo', format='dirstate-with-subtree')
1044
1041
        bundle.install_revisions(repo)
1045
 
        inv_text = repo._get_inventory_xml('rev2')
 
1042
        inv_text = repo.get_inventory_xml('rev2')
1046
1043
        self.assertNotContainsRe(inv_text, 'format="5"')
1047
1044
        self.assertContainsRe(inv_text, 'format="7"')
1048
1045
 
1068
1065
 
1069
1066
    def test_inv_hash_across_serializers(self):
1070
1067
        repo = self.make_repo_with_installed_revisions()
1071
 
        recorded_inv_sha1 = repo.get_revision('rev2').inventory_sha1
1072
 
        xml = repo._get_inventory_xml('rev2')
 
1068
        recorded_inv_sha1 = repo.get_inventory_sha1('rev2')
 
1069
        xml = repo.get_inventory_xml('rev2')
1073
1070
        self.assertEqual(osutils.sha_string(xml), recorded_inv_sha1)
1074
1071
 
1075
1072
    def test_across_models_incompatible(self):
1415
1412
        branch = tree_a.branch
1416
1413
        repo_a = branch.repository
1417
1414
        tree_a.commit("base", allow_pointless=True, rev_id='A')
1418
 
        self.assertFalse(branch.repository.has_signature_for_revision_id('A'))
 
1415
        self.failIf(branch.repository.has_signature_for_revision_id('A'))
1419
1416
        try:
1420
1417
            from bzrlib.testament import Testament
1421
1418
            # monkey patch gpg signing mechanism
1445
1442
        install_bundle(repo_b, serializer.read(s))
1446
1443
 
1447
1444
 
 
1445
class V4WeaveBundleTester(V4BundleTester):
 
1446
 
 
1447
    def bzrdir_format(self):
 
1448
        return 'metaweave'
 
1449
 
 
1450
 
1448
1451
class V4_2aBundleTester(V4BundleTester):
1449
1452
 
1450
1453
    def bzrdir_format(self):
1817
1820
            def look_up(self, name, url):
1818
1821
                return 'source'
1819
1822
        directories.register('foo:', FooService, 'Testing directory service')
1820
 
        self.addCleanup(directories.remove, 'foo:')
 
1823
        self.addCleanup(lambda: directories.remove('foo:'))
1821
1824
        self.build_tree_contents([('./foo:bar', out.getvalue())])
1822
1825
        self.assertRaises(errors.NotABundle, read_mergeable_from_url,
1823
1826
                          'foo:bar')
1847
1850
class _DisconnectingTCPServer(object):
1848
1851
    """A TCP server that immediately closes any connection made to it."""
1849
1852
 
1850
 
    def start_server(self):
 
1853
    def setUp(self):
1851
1854
        self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
1852
1855
        self.sock.bind(('127.0.0.1', 0))
1853
1856
        self.sock.listen(1)
1865
1868
    def get_url(self):
1866
1869
        return 'bzr://127.0.0.1:%d/' % (self.port,)
1867
1870
 
1868
 
    def stop_server(self):
 
1871
    def tearDown(self):
1869
1872
        try:
1870
1873
            # make sure the thread dies by connecting to the listening socket,
1871
1874
            # just in case the test failed to do so.
1876
1879
            pass
1877
1880
        self.sock.close()
1878
1881
        self.thread.join()
 
1882