← 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: John Arbash Meinel
  • Date: 2009-12-10 17:16:19 UTC
  • mfrom: (4884 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4889.
  • Revision ID: john@arbash-meinel.com-20091210171619-ehdcxjbl8afhq9g1
Bring in bzr.dev 4884

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()