##// END OF EJS Templates
Refactor of prompts and the displayhook....
Refactor of prompts and the displayhook. * Renamed CachedOutput to displayhook.DisplayHook. * Added methods that DisplayHook.__call__ uses to do its work. These methods can now be overridden for the ZMQ kernel. * Removed all hooks (result_display and generate_output_prompt) that the outputcache was using. We need to add these back in once we figure out what to do about hooks in general.

File last commit:

r2498:3eae1372
r2781:775b3992
Show More
_paramtestpy3.py
69 lines | 2.2 KiB | text/x-python | PythonLexer
Fernando Perez
Added test support for better parametric tests and nose fixes....
r2367 """Implementation of the parametric test support for Python 3.x.
Thanks for the py3 version to Robert Collins, from the Testing in Python
mailing list.
"""
Brian Granger
Work to address the review comments on Fernando's branch....
r2498
#-----------------------------------------------------------------------------
# Copyright (C) 2009 The IPython Development Team
#
# Distributed under the terms of the BSD License. The full license is in
# the file COPYING, distributed as part of this software.
#-----------------------------------------------------------------------------
Fernando Perez
Added test support for better parametric tests and nose fixes....
r2367 #-----------------------------------------------------------------------------
# Imports
#-----------------------------------------------------------------------------
import unittest
from unittest import TestSuite
#-----------------------------------------------------------------------------
# Classes and functions
#-----------------------------------------------------------------------------
def isgenerator(func):
return hasattr(func,'_generator')
class IterCallableSuite(TestSuite):
def __init__(self, iterator, adapter):
self._iter = iterator
self._adapter = adapter
def __iter__(self):
yield self._adapter(self._iter.__next__)
class ParametricTestCase(unittest.TestCase):
"""Write parametric tests in normal unittest testcase form.
Limitations: the last iteration misses printing out a newline when
running in verbose mode.
"""
def run(self, result=None):
testMethod = getattr(self, self._testMethodName)
# For normal tests, we just call the base class and return that
if isgenerator(testMethod):
def adapter(next_test):
return unittest.FunctionTestCase(next_test,
self.setUp,
self.tearDown)
return IterCallableSuite(testMethod(),adapter).run(result)
else:
return super(ParametricTestCase, self).run(result)
def parametric(func):
"""Decorator to make a simple function into a normal test via
unittest."""
# Hack, until I figure out how to write isgenerator() for python3!!
func._generator = True
class Tester(ParametricTestCase):
test = staticmethod(func)
Tester.__name__ = func.__name__
return Tester