| Index: Tools/Scripts/webkitpy/thirdparty/unittest2/runner.py
|
| diff --git a/Tools/Scripts/webkitpy/thirdparty/unittest2/runner.py b/Tools/Scripts/webkitpy/thirdparty/unittest2/runner.py
|
| deleted file mode 100644
|
| index e8b77845fb5cc8da92fcc61b39506bd4c598f246..0000000000000000000000000000000000000000
|
| --- a/Tools/Scripts/webkitpy/thirdparty/unittest2/runner.py
|
| +++ /dev/null
|
| @@ -1,206 +0,0 @@
|
| -"""Running tests"""
|
| -
|
| -import sys
|
| -import time
|
| -import unittest
|
| -
|
| -from unittest2 import result
|
| -
|
| -try:
|
| - from unittest2.signals import registerResult
|
| -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):
|
| - self.stream = stream
|
| -
|
| - def __getattr__(self, attr):
|
| - if attr in ('stream', '__getstate__'):
|
| - raise AttributeError(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
|
| -
|
| -
|
| -class TextTestResult(result.TestResult):
|
| - """A test result class that can print formatted text results to a stream.
|
| -
|
| - Used by TextTestRunner.
|
| - """
|
| - separator1 = '=' * 70
|
| - separator2 = '-' * 70
|
| -
|
| - def __init__(self, stream, descriptions, verbosity):
|
| - super(TextTestResult, self).__init__()
|
| - self.stream = stream
|
| - self.showAll = verbosity > 1
|
| - self.dots = verbosity == 1
|
| - self.descriptions = descriptions
|
| -
|
| - def getDescription(self, test):
|
| - doc_first_line = test.shortDescription()
|
| - if self.descriptions and doc_first_line:
|
| - return '\n'.join((str(test), doc_first_line))
|
| - else:
|
| - return str(test)
|
| -
|
| - def startTest(self, test):
|
| - super(TextTestResult, self).startTest(test)
|
| - if self.showAll:
|
| - self.stream.write(self.getDescription(test))
|
| - self.stream.write(" ... ")
|
| - self.stream.flush()
|
| -
|
| - def addSuccess(self, test):
|
| - super(TextTestResult, self).addSuccess(test)
|
| - if self.showAll:
|
| - self.stream.writeln("ok")
|
| - elif self.dots:
|
| - self.stream.write('.')
|
| - self.stream.flush()
|
| -
|
| - def addError(self, test, err):
|
| - super(TextTestResult, self).addError(test, err)
|
| - if self.showAll:
|
| - self.stream.writeln("ERROR")
|
| - elif self.dots:
|
| - self.stream.write('E')
|
| - self.stream.flush()
|
| -
|
| - def addFailure(self, test, err):
|
| - super(TextTestResult, self).addFailure(test, err)
|
| - if self.showAll:
|
| - self.stream.writeln("FAIL")
|
| - elif self.dots:
|
| - self.stream.write('F')
|
| - self.stream.flush()
|
| -
|
| - def addSkip(self, test, reason):
|
| - super(TextTestResult, self).addSkip(test, reason)
|
| - if self.showAll:
|
| - self.stream.writeln("skipped %r" % (reason,))
|
| - elif self.dots:
|
| - self.stream.write("s")
|
| - self.stream.flush()
|
| -
|
| - def addExpectedFailure(self, test, err):
|
| - super(TextTestResult, self).addExpectedFailure(test, err)
|
| - if self.showAll:
|
| - self.stream.writeln("expected failure")
|
| - elif self.dots:
|
| - self.stream.write("x")
|
| - self.stream.flush()
|
| -
|
| - def addUnexpectedSuccess(self, test):
|
| - super(TextTestResult, self).addUnexpectedSuccess(test)
|
| - if self.showAll:
|
| - self.stream.writeln("unexpected success")
|
| - elif self.dots:
|
| - self.stream.write("u")
|
| - self.stream.flush()
|
| -
|
| - def printErrors(self):
|
| - if self.dots or self.showAll:
|
| - self.stream.writeln()
|
| - self.printErrorList('ERROR', self.errors)
|
| - self.printErrorList('FAIL', self.failures)
|
| -
|
| - 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(self.separator2)
|
| - self.stream.writeln("%s" % err)
|
| -
|
| - def stopTestRun(self):
|
| - super(TextTestResult, self).stopTestRun()
|
| - self.printErrors()
|
| -
|
| -
|
| -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
|
| - occur, and a summary of the results at the end of the test run.
|
| - """
|
| - resultclass = TextTestResult
|
| -
|
| - def __init__(self, stream=sys.stderr, descriptions=True, verbosity=1,
|
| - failfast=False, buffer=False, resultclass=None):
|
| - self.stream = _WritelnDecorator(stream)
|
| - self.descriptions = descriptions
|
| - self.verbosity = verbosity
|
| - self.failfast = failfast
|
| - self.buffer = buffer
|
| - if resultclass is not None:
|
| - self.resultclass = resultclass
|
| -
|
| - def _makeResult(self):
|
| - return self.resultclass(self.stream, self.descriptions, self.verbosity)
|
| -
|
| - def run(self, test):
|
| - "Run the given test case or test suite."
|
| - result = self._makeResult()
|
| - result.failfast = self.failfast
|
| - result.buffer = self.buffer
|
| - registerResult(result)
|
| -
|
| - startTime = time.time()
|
| - startTestRun = getattr(result, 'startTestRun', None)
|
| - if startTestRun is not None:
|
| - startTestRun()
|
| - try:
|
| - test(result)
|
| - finally:
|
| - stopTestRun = getattr(result, 'stopTestRun', None)
|
| - if stopTestRun is not None:
|
| - stopTestRun()
|
| - else:
|
| - result.printErrors()
|
| - stopTime = time.time()
|
| - timeTaken = stopTime - startTime
|
| - if hasattr(result, 'separator2'):
|
| - self.stream.writeln(result.separator2)
|
| - run = result.testsRun
|
| - 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,
|
| - result.unexpectedSuccesses,
|
| - result.skipped))
|
| - expectedFails, unexpectedSuccesses, skipped = results
|
| - except AttributeError:
|
| - pass
|
| - infos = []
|
| - if not result.wasSuccessful():
|
| - self.stream.write("FAILED")
|
| - failed, errored = map(len, (result.failures, result.errors))
|
| - if failed:
|
| - infos.append("failures=%d" % failed)
|
| - if errored:
|
| - infos.append("errors=%d" % errored)
|
| - else:
|
| - self.stream.write("OK")
|
| - if skipped:
|
| - infos.append("skipped=%d" % skipped)
|
| - if expectedFails:
|
| - infos.append("expected failures=%d" % expectedFails)
|
| - if unexpectedSuccesses:
|
| - infos.append("unexpected successes=%d" % unexpectedSuccesses)
|
| - if infos:
|
| - self.stream.writeln(" (%s)" % (", ".join(infos),))
|
| - else:
|
| - self.stream.write("\n")
|
| - return result
|
|
|