From: Ben Darnell <ben@bendarnell.com>
Date: Thu, 21 Oct 2010 21:56:30 +0000 (-0700)
Subject: Use AsyncHTTPTestCase.fetch instead of overriding it with a less useful
X-Git-Tag: v1.2.0~95
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83d623a1c5495a6f973f55df95e91495c4bb44a5;p=thirdparty%2Ftornado.git

Use AsyncHTTPTestCase.fetch instead of overriding it with a less useful
version.
---

diff --git a/tornado/test/simple_httpclient_test.py b/tornado/test/simple_httpclient_test.py
index 7a7fb7b26..a30ea8fab 100644
--- a/tornado/test/simple_httpclient_test.py
+++ b/tornado/test/simple_httpclient_test.py
@@ -22,10 +22,6 @@ class ChunkHandler(RequestHandler):
         self.write("qwer")
 
 class SimpleHTTPClientTestCase(AsyncHTTPTestCase, LogTrapTestCase):
-    def fetch(self, url, **kwargs):
-        self.http_client.fetch(url, self.stop, **kwargs)
-        return self.wait()
-
     def get_app(self):
         return Application([
             ("/hello", HelloWorldHandler),
@@ -39,35 +35,35 @@ class SimpleHTTPClientTestCase(AsyncHTTPTestCase, LogTrapTestCase):
         self.http_client = SimpleAsyncHTTPClient(io_loop=self.io_loop)
 
     def test_hello_world(self):
-        response = self.fetch(self.get_url("/hello"))
+        response = self.fetch("/hello")
         self.assertEqual(response.code, 200)
         self.assertEqual(response.headers["Content-Type"], "text/plain")
         self.assertEqual(response.body, "Hello world!")
 
-        response = self.fetch(self.get_url("/hello?name=Ben"))
+        response = self.fetch("/hello?name=Ben")
         self.assertEqual(response.body, "Hello Ben!")
 
     def test_streaming_callback(self):
         # streaming_callback is also tested in test_chunked
         chunks = []
-        response = self.fetch(self.get_url("/hello"),
+        response = self.fetch("/hello",
                               streaming_callback=chunks.append)
         # with streaming_callback, data goes to the callback and not response.body
         self.assertEqual(chunks, ["Hello world!"])
         self.assertFalse(response.body)
 
     def test_post(self):
-        response = self.fetch(self.get_url("/post"), method="POST",
+        response = self.fetch("/post", method="POST",
                               body="arg1=foo&arg2=bar")
         self.assertEqual(response.code, 200)
         self.assertEqual(response.body, "Post arg1: foo, arg2: bar")
 
     def test_chunked(self):
-        response = self.fetch(self.get_url("/chunk"))
+        response = self.fetch("/chunk")
         self.assertEqual(response.body, "asdfqwer")
 
         chunks = []
-        response = self.fetch(self.get_url("/chunk"),
+        response = self.fetch("/chunk",
                               streaming_callback=chunks.append)
         self.assertEqual(chunks, ["asdf", "qwer"])
         self.assertFalse(response.body)