From 64215114be290db2d55fd827a9089231f99c0383 Mon Sep 17 00:00:00 2001 From: Frederic Peters Date: Sun, 25 Jul 2004 16:52:28 +0000 Subject: basic XmlTestRunner; ./tests.py --xml; output to stdout (messed up with lasso spouting messages on stdout; will be fixed on lasso side) --- python/tests/XmlTestRunner.py | 59 +++++++++++++++++++++++++++++++++++++++++++ python/tests/tests.py | 27 +++++++++++++++----- 2 files changed, 79 insertions(+), 7 deletions(-) create mode 100644 python/tests/XmlTestRunner.py (limited to 'python') diff --git a/python/tests/XmlTestRunner.py b/python/tests/XmlTestRunner.py new file mode 100644 index 00000000..282362ef --- /dev/null +++ b/python/tests/XmlTestRunner.py @@ -0,0 +1,59 @@ +# -*- coding: UTF-8 -*- +# +# XmlTestRunner +# +# Copyright (C) 2004 Entr'ouvert +# +# Authors: Frederic Peters +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +import unittest +import time +import sys + +class XmlTestResult(unittest.TestResult): + def addSuccess(self, test): + print """ + %s + %s + """ % (test.id(), test.shortDescription()) + + def addFailure(self, test, err): + unittest.TestResult.addFailure(self, test, err) + print """ + %s + %s + """ % (test.id(), test.shortDescription()) + # TODO: add err + + +class XmlTestRunner: + def _makeResult(self): + return XmlTestResult() + + def run(self, test): + print "" + result = self._makeResult() + startTime = time.time() + test(result) + stopTime = time.time() + timeTaken = float(stopTime - startTime) + print " %s" % timeTaken + print "" + + return result + diff --git a/python/tests/tests.py b/python/tests/tests.py index 644135eb..7c944b65 100755 --- a/python/tests/tests.py +++ b/python/tests/tests.py @@ -30,6 +30,8 @@ import imp import sys import unittest +from XmlTestRunner import XmlTestRunner + sys.path.insert(0, '..') sys.path.insert(0, '../.libs') @@ -38,6 +40,10 @@ testSuites = ( 'login_tests', ) +if "--xml" in sys.argv: + print """""" + print """""" + success = True for testSuite in testSuites: fp, pathname, description = imp.find_module(testSuite) @@ -47,20 +53,27 @@ for testSuite in testSuites: if fp: fp.close() if not module: - print 'Unable to load test suite:', testSuite + print >> sys.stderr, 'Unable to load test suite:', testSuite + continue if module.__doc__: doc = module.__doc__ else: doc = testSuite - print - print '-' * len(doc) - print doc - print '-' * len(doc) - - result = unittest.TextTestRunner(verbosity=2).run(module.allTests) + if "--xml" in sys.argv: + runner = XmlTestRunner() + else: + runner = unittest.TextTestRunner(verbosity=2) + print + print '-' * len(doc) + print doc + print '-' * len(doc) + result = runner.run(module.allTests) success = success and result.wasSuccessful() +if "--xml" in sys.argv: + print """""" + sys.exit(not success) -- cgit