From: Ben Darnell <ben@bendarnell.com>
Date: Sun, 30 Sep 2012 00:46:50 +0000 (-0700)
Subject: Cleanly shut down the ThreadPoolExecutor in Resolver tests.
X-Git-Tag: v3.0.0~260
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e40f5061f82b833554b68707d5c3f518302e24b;p=thirdparty%2Ftornado.git

Cleanly shut down the ThreadPoolExecutor in Resolver tests.

This was somehow causing a problem on Ubuntu 10.04.
---

diff --git a/tornado/test/netutil_test.py b/tornado/test/netutil_test.py
index 69c0ae33f..a2966b2be 100644
--- a/tornado/test/netutil_test.py
+++ b/tornado/test/netutil_test.py
@@ -32,6 +32,11 @@ class ThreadedResolverTest(AsyncTestCase, _ResolverTestMixin):
     def setUp(self):
         super(ThreadedResolverTest, self).setUp()
         from concurrent.futures import ThreadPoolExecutor
-        self.resolver = Resolver(self.io_loop, ThreadPoolExecutor(2))
+        self.executor = ThreadPoolExecutor(2)
+        self.resolver = Resolver(self.io_loop, self.executor)
+
+    def tearDown(self):
+        self.executor.shutdown()
+        super(ThreadedResolverTest, self).tearDown()
 ThreadedResolverTest = unittest.skipIf(
     futures is None, "futures module not present")(ThreadedResolverTest)