diff options
Diffstat (limited to 'tests/functional-tests/unittest2/runner.py')
| -rw-r--r-- | tests/functional-tests/unittest2/runner.py | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/tests/functional-tests/unittest2/runner.py b/tests/functional-tests/unittest2/runner.py index 8dfce9406..2769d1474 100644 --- a/tests/functional-tests/unittest2/runner.py +++ b/tests/functional-tests/unittest2/runner.py @@ -13,27 +13,30 @@ try: except ImportError: def registerResult(_): pass - + __unittest = True class _WritelnDecorator(object): + """Used to decorate file-like objects with a handy 'writeln' method""" - def __init__(self,stream): + + def __init__(self, stream): self.stream = stream def __getattr__(self, attr): if attr in ('stream', '__getstate__'): raise AttributeError(attr) - return getattr(self.stream,attr) + return getattr(self.stream, attr) def writeln(self, arg=None): if arg: self.write(arg) - self.write('\n') # text-mode streams translate to \r\n if needed + self.write('\n') # text-mode streams translate to \r\n if needed class TextTestResult(result.TestResult): + """A test result class that can print formatted text results to a stream. Used by TextTestRunner. @@ -119,7 +122,8 @@ class TextTestResult(result.TestResult): def printErrorList(self, flavour, errors): for test, err in errors: self.stream.writeln(self.separator1) - self.stream.writeln("%s: %s" % (flavour, self.getDescription(test))) + self.stream.writeln( + "%s: %s" % (flavour, self.getDescription(test))) self.stream.writeln(self.separator2) self.stream.writeln("%s" % err) @@ -129,6 +133,7 @@ class TextTestResult(result.TestResult): class TextTestRunner(unittest.TextTestRunner): + """A test runner class that displays results in textual form. It prints out the names of tests as they are run, errors as they @@ -137,7 +142,7 @@ class TextTestRunner(unittest.TextTestRunner): resultclass = TextTestResult def __init__(self, stream=sys.stderr, descriptions=True, verbosity=1, - failfast=False, buffer=False, resultclass=None): + failfast=False, buffer=False, resultclass=None): self.stream = _WritelnDecorator(stream) self.descriptions = descriptions self.verbosity = verbosity @@ -155,7 +160,7 @@ class TextTestRunner(unittest.TextTestRunner): result.failfast = self.failfast result.buffer = self.buffer registerResult(result) - + startTime = time.time() startTestRun = getattr(result, 'startTestRun', None) if startTestRun is not None: @@ -176,7 +181,7 @@ class TextTestRunner(unittest.TextTestRunner): self.stream.writeln("Ran %d test%s in %.3fs" % (run, run != 1 and "s" or "", timeTaken)) self.stream.writeln() - + expectedFails = unexpectedSuccesses = skipped = 0 try: results = map(len, (result.expectedFailures, |