Test compatible with Python 3

tatiana · Mar 28, 2013 · 53691e5 · 53691e5
1 parent a3ea593
commit 53691e5
Showing 1 changed file with 19 additions and 8 deletions.
diff --git a/tests/test_tornado_cors.py b/tests/test_tornado_cors.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 import imp
 import functools
+import sys
 
 from tornado.testing import AsyncHTTPTestCase
 from tornado.web import Application, asynchronous, RequestHandler
@@ -60,19 +61,29 @@ def tearDown(self):
         custom_decorator.wrapper = self.original_wrapper
 
     def test_wrapper_customization(self):
-        # assert default wrapper is being used
+        version = sys.version_info[0]
-        wrapper_module_name = cors.CorsMixin.options.im_func.func_code.co_filename
+        if version == 2:
-        self.assertFalse(passed_by_custom_wrapper)
+            # assert default wrapper is being used        
-        self.assertTrue(wrapper_module_name.endswith("tornado/web.py"))
+            wrapper_module_name = cors.CorsMixin.options.im_func.func_code.co_filename
+            self.assertFalse(passed_by_custom_wrapper)
+            self.assertTrue(wrapper_module_name.endswith("tornado/web.py"))
+
+        self.assertEquals(cors.custom_decorator.wrapper, asynchronous)
 
         # overwrite using custom wrapper and reload module
         custom_decorator.wrapper = custom_wrapper
         imp.reload(cors)
 
-        # assert new wrapper is being used
+        if version == 2:
-        wrapper_module_name = cors.CorsMixin.options.im_func.func_code.co_filename
+            # assert new wrapper is being used
-        self.assertTrue(passed_by_custom_wrapper)
+            wrapper_module_name = cors.CorsMixin.options.im_func.func_code.co_filename
-        self.assertTrue(wrapper_module_name.endswith("tests/test_tornado_cors.py"))
+            self.assertTrue(passed_by_custom_wrapper)
+            self.assertTrue(wrapper_module_name.endswith("tests/test_tornado_cors.py"))
+
+        self.assertEquals(cors.custom_decorator.wrapper, custom_wrapper)
+
+
+
 
 
 class DefaultValuesHandler(cors.CorsMixin, RequestHandler):