From 53691e54a821baa227caff4a5fc96e43eb2ddbcd Mon Sep 17 00:00:00 2001 From: Tatiana Al-Chueyr Date: Thu, 28 Mar 2013 14:48:07 -0300 Subject: [PATCH] Test compatible with Python 3 --- tests/test_tornado_cors.py | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/tests/test_tornado_cors.py b/tests/test_tornado_cors.py index de85ef8..ac16c3a 100644 --- 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 - 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")) + version = sys.version_info[0] + if version == 2: + # assert default wrapper is being used + 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 - wrapper_module_name = cors.CorsMixin.options.im_func.func_code.co_filename - self.assertTrue(passed_by_custom_wrapper) - self.assertTrue(wrapper_module_name.endswith("tests/test_tornado_cors.py")) + if version == 2: + # assert new wrapper is being used + wrapper_module_name = cors.CorsMixin.options.im_func.func_code.co_filename + 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):