testing: Move setup_with_context_manager to testing module

diff --git a/tornado/test/ioloop_test.py b/tornado/test/ioloop_test.py
index e9466341e8b546aa17fe11c3167c53d99d0a4be4..b3a223318a35c920637b7741aa8382fb06e3a5a9 100644 (file)
--- a/tornado/test/ioloop_test.py
+++ b/tornado/test/ioloop_test.py
@@ -16,10 +16,15 @@ from tornado.escape import native_str
 from tornado import gen
 from tornado.ioloop import IOLoop, TimeoutError, PeriodicCallback
 from tornado.log import app_log
-from tornado.testing import AsyncTestCase, bind_unused_port, ExpectLog, gen_test
+from tornado.testing import (
+    AsyncTestCase,
+    bind_unused_port,
+    ExpectLog,
+    gen_test,
+    setup_with_context_manager,
+)
 from tornado.test.util import (
     ignore_deprecation,
-    setup_with_context_manager,
     skipIfNonUnix,
     skipOnTravis,
 )

diff --git a/tornado/test/util.py b/tornado/test/util.py
index b0d62af34b307022370b0f4280ea0025804912c8..bcb9bbde24139c5a6998b5611b6d828a826c4b5e 100644 (file)
--- a/tornado/test/util.py
+++ b/tornado/test/util.py
@@ -112,11 +112,3 @@ def ignore_deprecation():
     with warnings.catch_warnings():
         warnings.simplefilter("ignore", DeprecationWarning)
         yield
-
-
-# From https://nedbatchelder.com/blog/201508/using_context_managers_in_test_setup.html
-def setup_with_context_manager(testcase, cm):
-    """Use a contextmanager to setUp a test case."""
-    val = cm.__enter__()
-    testcase.addCleanup(cm.__exit__, None, None, None)
-    return val

diff --git a/tornado/testing.py b/tornado/testing.py
index 0996f7a46a7ea340cdbc38eb88650889cdc68dd4..cdea88ee0a20adc65f3bcafe0602162f869e3c37 100644 (file)
--- a/tornado/testing.py
+++ b/tornado/testing.py
@@ -762,6 +762,14 @@ class ExpectLog(logging.Filter):
             raise Exception("did not get expected log message")
 
 
+# From https://nedbatchelder.com/blog/201508/using_context_managers_in_test_setup.html
+def setup_with_context_manager(testcase: unittest.TestCase, cm: Any) -> Any:
+    """Use a contextmanager to setUp a test case."""
+    val = cm.__enter__()
+    testcase.addCleanup(cm.__exit__, None, None, None)
+    return val
+
+
 def main(**kwargs: Any) -> None:
     """A simple test runner.