From: Niko Wilbert <mail@nikowilbert.de>
Date: Fri, 22 Aug 2014 08:48:42 +0000 (+0200)
Subject: Fixed support for test generators
X-Git-Tag: v4.0.2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ed7bd3a2bd8948f8a3745582233f50d14ba86720;p=thirdparty%2Ftornado.git

Fixed support for test generators

This fixes the problem that AsyncTestCase no longer seemed to work with test generators (as supported by Nose, http://nose.readthedocs.org/en/latest/writing_tests.html#test-generators).
---

diff --git a/tornado/testing.py b/tornado/testing.py
index b4bfb274a..6dd759b91 100644
--- a/tornado/testing.py
+++ b/tornado/testing.py
@@ -114,8 +114,8 @@ class _TestMethodWrapper(object):
     def __init__(self, orig_method):
         self.orig_method = orig_method
 
-    def __call__(self):
-        result = self.orig_method()
+    def __call__(self, *args, **kwargs):
+        result = self.orig_method(*args, **kwargs)
         if isinstance(result, types.GeneratorType):
             raise TypeError("Generator test methods should be decorated with "
                             "tornado.testing.gen_test")