From: Ben Darnell <ben@bendarnell.com>
Date: Wed, 15 Aug 2012 17:38:09 +0000 (-0700)
Subject: Test cleanup.
X-Git-Tag: v2.4.0~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b07385042415601f31392c8c1f189b9584e005f;p=thirdparty%2Ftornado.git

Test cleanup.

Listen on 127.0.0.1 to avoid firewall warnings. Move to AsyncHTTPTestCase
to reduce boilerplate.  Close a leaking file descriptor (ResourceWarnings
are still just printing out instead of making the tests fail)
---

diff --git a/tornado/test/simple_httpclient_test.py b/tornado/test/simple_httpclient_test.py
index 72dcdd163..fee55330b 100644
--- a/tornado/test/simple_httpclient_test.py
+++ b/tornado/test/simple_httpclient_test.py
@@ -321,21 +321,22 @@ class CreateAsyncHTTPClientTestCase(AsyncTestCase, LogTrapTestCase):
             self.assertEqual(client.max_clients, 14)
 
 
-class HTTP100ContinueTestCase(AsyncTestCase, LogTrapTestCase):
+class HTTP100ContinueTestCase(AsyncHTTPTestCase, LogTrapTestCase):
     def respond_100(self, request):
         self.request = request
-        self.request.connection.stream.write(b("HTTP/1.1 100 CONTINUE\r\n\r\n"), self.respond_200)
+        self.request.connection.stream.write(
+            b("HTTP/1.1 100 CONTINUE\r\n\r\n"),
+            self.respond_200)
 
     def respond_200(self):
-        self.request.connection.stream.write(b("HTTP/1.1 200 OK\r\nContent-Length: 1\r\n\r\nA"))
+        self.request.connection.stream.write(
+            b("HTTP/1.1 200 OK\r\nContent-Length: 1\r\n\r\nA"),
+            self.request.connection.stream.close)
+
+    def get_app(self):
+        # Not a full Application, but works as an HTTPServer callback
+        return self.respond_100
 
     def test_100_continue(self):
-        from tornado.httpserver import HTTPServer
-
-        port   = get_unused_port()
-        server = HTTPServer(self.respond_100, io_loop = self.io_loop)
-        server.listen(port)
-        client = SimpleAsyncHTTPClient(io_loop = self.io_loop)
-        client.fetch('http://localhost:%d/' % port, self.stop)
-        res = self.wait()
+        res = self.fetch('/')
         self.assertEqual(res.body, b('A'))