From 5eb39608dff69b49ff3219f9016120568d558226 Mon Sep 17 00:00:00 2001
From: Stefan Tjarks <stefan@demonware.net>
Date: Fri, 16 May 2014 16:03:01 -0700
Subject: [PATCH] Extended gen_test decorator to pass args and kwargs. A use
 case might be a decorated test class that passes arguments to each class
 method, like mock.patch for instance.

---
 tornado/test/testing_test.py | 18 ++++++++++++++++++
 tornado/testing.py           |  9 +++++----
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/tornado/test/testing_test.py b/tornado/test/testing_test.py
index aabdaced7..1c8a86507 100644
--- a/tornado/test/testing_test.py
+++ b/tornado/test/testing_test.py
@@ -198,5 +198,23 @@ class GenTest(AsyncTestCase):
 
         self.finished = True
 
+    def test_with_method_args(self):
+        @gen_test
+        def test_with_args(self, *args):
+            self.assertEqual(args, ('test',))
+            yield gen.Task(self.io_loop.add_callback)
+
+        test_with_args(self, 'test')
+        self.finished = True
+
+    def test_with_method_kwargs(self):
+        @gen_test
+        def test_with_kwargs(self, **kwargs):
+            self.assertDictEqual(kwargs, {'test': 'test'})
+            yield gen.Task(self.io_loop.add_callback)
+
+        test_with_kwargs(self, test='test')
+        self.finished = True
+
 if __name__ == '__main__':
     unittest.main()
diff --git a/tornado/testing.py b/tornado/testing.py
index ec6505584..8967a43a0 100644
--- a/tornado/testing.py
+++ b/tornado/testing.py
@@ -471,8 +471,8 @@ def gen_test(func=None, timeout=None):
         # This is a good case study arguing for either some sort of
         # extensibility in the gen decorators or cancellation support.
         @functools.wraps(f)
-        def pre_coroutine(self):
-            result = f(self)
+        def pre_coroutine(self, *args, **kwargs):
+            result = f(self, *args, **kwargs)
             if isinstance(result, types.GeneratorType):
                 self._test_generator = result
             else:
@@ -482,10 +482,11 @@ def gen_test(func=None, timeout=None):
         coro = gen.coroutine(pre_coroutine)
 
         @functools.wraps(coro)
-        def post_coroutine(self):
+        def post_coroutine(self, *args, **kwargs):
             try:
                 return self.io_loop.run_sync(
-                    functools.partial(coro, self), timeout=timeout)
+                    functools.partial(coro, self, *args, **kwargs),
+                    timeout=timeout)
             except TimeoutError as e:
                 # run_sync raises an error with an unhelpful traceback.
                 # If we throw it back into the generator the stack trace
-- 
2.47.2