diff options
-rw-r--r-- | cheetah/Tests/SyntaxAndOutput.py | 37 | ||||
-rwxr-xr-x | cheetah/Tests/Test.py | 8 |
2 files changed, 25 insertions, 20 deletions
diff --git a/cheetah/Tests/SyntaxAndOutput.py b/cheetah/Tests/SyntaxAndOutput.py index e9b6cc2..dcd2017 100644 --- a/cheetah/Tests/SyntaxAndOutput.py +++ b/cheetah/Tests/SyntaxAndOutput.py @@ -3198,29 +3198,30 @@ else: extraCompileKwArgsForDiffBaseclass = {'baseclass':object} -for klass in [var for var in globals().values() - if type(var) == types.ClassType and issubclass(var, unittest.TestCase)]: - name = klass.__name__ - if hasattr(klass,'convertEOLs') and klass.convertEOLs: - win32Src = r"class %(name)s_Win32EOL(%(name)s): _EOLreplacement = '\r\n'"%locals() - macSrc = r"class %(name)s_MacEOL(%(name)s): _EOLreplacement = '\r'"%locals() - #print win32Src - #print macSrc - exec win32Src+'\n' - exec macSrc+'\n' - - if versionTuple >= (2,3): - src = r"class %(name)s_DiffBaseClass(%(name)s): "%locals() - src += " _extraCompileKwArgs = extraCompileKwArgsForDiffBaseclass" - exec src+'\n' - - del name - del klass +def install_eols(): + klasses = [v for v in globals().values() if isinstance(v, (types.ClassType, types.TypeType)) and issubclass(v, unittest.TestCase)] + print ('klasses', klasses) + for klass in klasses: + name = klass.__name__ + if hasattr(klass,'convertEOLs') and klass.convertEOLs: + win32Src = r"class %(name)s_Win32EOL(%(name)s): _EOLreplacement = '\r\n'"%locals() + macSrc = r"class %(name)s_MacEOL(%(name)s): _EOLreplacement = '\r'"%locals() + exec win32Src in globals() + exec macSrc in globals() + + if versionTuple >= (2,3): + src = r"class %(name)s_DiffBaseClass(%(name)s): "%locals() + src += " _extraCompileKwArgs = extraCompileKwArgsForDiffBaseclass" + exec src in globals() + + del name + del klass ################################################## ## if run from the command line ## if __name__ == '__main__': + install_eols() unittest.main() # vim: shiftwidth=4 tabstop=4 expandtab diff --git a/cheetah/Tests/Test.py b/cheetah/Tests/Test.py index 86341f9..a40f833 100755 --- a/cheetah/Tests/Test.py +++ b/cheetah/Tests/Test.py @@ -15,20 +15,24 @@ import unittest import SyntaxAndOutput import NameMapper +import Filters import Template -import CheetahWrapper import Cheps import Regressions import Unicode import VerifyType +import CheetahWrapper + +SyntaxAndOutput.install_eols() suites = [ unittest.findTestCases(SyntaxAndOutput), unittest.findTestCases(NameMapper), + unittest.findTestCases(Filters), unittest.findTestCases(Template), + #unittest.findTestCases(Cheps), unittest.findTestCases(Regressions), unittest.findTestCases(Unicode), - unittest.findTestCases(Cheps), unittest.findTestCases(VerifyType), ] |