← 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: Canonical.com Patch Queue Manager
  • Date: 2010-03-02 08:49:07 UTC
  • mfrom: (5067.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100302084907-z4r0yoa4ldspjz82
(vila) Resolve --take-this or --take-other correctly rename kept file

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bundle.py
1
 
# Copyright (C) 2004, 2005, 2006, 2007 Canonical Ltd
 
1
# Copyright (C) 2005-2010 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
1039
1039
        bundle = read_bundle(self.create_bundle_text('null:', 'rev2')[0])
1040
1040
        repo = self.make_repository('repo', format='dirstate-with-subtree')
1041
1041
        bundle.install_revisions(repo)
1042
 
        inv_text = repo.get_inventory_xml('rev2')
 
1042
        inv_text = repo._get_inventory_xml('rev2')
1043
1043
        self.assertNotContainsRe(inv_text, 'format="5"')
1044
1044
        self.assertContainsRe(inv_text, 'format="7"')
1045
1045
 
1065
1065
 
1066
1066
    def test_inv_hash_across_serializers(self):
1067
1067
        repo = self.make_repo_with_installed_revisions()
1068
 
        recorded_inv_sha1 = repo.get_inventory_sha1('rev2')
1069
 
        xml = repo.get_inventory_xml('rev2')
 
1068
        recorded_inv_sha1 = repo.get_revision('rev2').inventory_sha1
 
1069
        xml = repo._get_inventory_xml('rev2')
1070
1070
        self.assertEqual(osutils.sha_string(xml), recorded_inv_sha1)
1071
1071
 
1072
1072
    def test_across_models_incompatible(self):
1820
1820
            def look_up(self, name, url):
1821
1821
                return 'source'
1822
1822
        directories.register('foo:', FooService, 'Testing directory service')
1823
 
        self.addCleanup(lambda: directories.remove('foo:'))
 
1823
        self.addCleanup(directories.remove, 'foo:')
1824
1824
        self.build_tree_contents([('./foo:bar', out.getvalue())])
1825
1825
        self.assertRaises(errors.NotABundle, read_mergeable_from_url,
1826
1826
                          'foo:bar')
1830
1830
        """
1831
1831
        from bzrlib.tests.blackbox.test_push import RedirectingMemoryServer
1832
1832
        server = RedirectingMemoryServer()
1833
 
        server.setUp()
 
1833
        self.start_server(server)
1834
1834
        url = server.get_url() + 'infinite-loop'
1835
 
        self.addCleanup(server.tearDown)
1836
1835
        self.assertRaises(errors.NotABundle, read_mergeable_from_url, url)
1837
1836
 
1838
1837
    def test_smart_server_connection_reset(self):
1841
1840
        """
1842
1841
        # Instantiate a server that will provoke a ConnectionReset
1843
1842
        sock_server = _DisconnectingTCPServer()
1844
 
        sock_server.setUp()
1845
 
        self.addCleanup(sock_server.tearDown)
 
1843
        self.start_server(sock_server)
1846
1844
        # We don't really care what the url is since the server will close the
1847
1845
        # connection without interpreting it
1848
1846
        url = sock_server.get_url()
1852
1850
class _DisconnectingTCPServer(object):
1853
1851
    """A TCP server that immediately closes any connection made to it."""
1854
1852
 
1855
 
    def setUp(self):
 
1853
    def start_server(self):
1856
1854
        self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
1857
1855
        self.sock.bind(('127.0.0.1', 0))
1858
1856
        self.sock.listen(1)
1870
1868
    def get_url(self):
1871
1869
        return 'bzr://127.0.0.1:%d/' % (self.port,)
1872
1870
 
1873
 
    def tearDown(self):
 
1871
    def stop_server(self):
1874
1872
        try:
1875
1873
            # make sure the thread dies by connecting to the listening socket,
1876
1874
            # just in case the test failed to do so.
1881
1879
            pass
1882
1880
        self.sock.close()
1883
1881
        self.thread.join()
1884