/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bundle.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-01-14 00:01:32 UTC
  • mfrom: (4957.1.1 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100114000132-3p3rabnonjw3gzqb
(jam) Merge bzr.stable, bringing in bug fixes #175839, #504390

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bundle.py
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