Skip to content

Commit

Permalink
[3.9] bpo-45057: Simplify RegressionTestResult (GH-28081) (GH-28103)
Browse files Browse the repository at this point in the history
Remove code which duplicates the functionality of TextTestResult.
(cherry picked from commit 2b76a53)
  • Loading branch information
serhiy-storchaka committed Sep 1, 2021
1 parent 2280bc1 commit e527f79
Showing 1 changed file with 2 additions and 31 deletions.
33 changes: 2 additions & 31 deletions Lib/test/support/testresult.py
Expand Up @@ -14,19 +14,16 @@
from datetime import datetime

class RegressionTestResult(unittest.TextTestResult):
separator1 = '=' * 70 + '\n'
separator2 = '-' * 70 + '\n'

def __init__(self, stream, descriptions, verbosity):
super().__init__(stream=stream, descriptions=descriptions, verbosity=0)
super().__init__(stream=stream, descriptions=descriptions,
verbosity=2 if verbosity else 0)
self.buffer = True
self.__suite = ET.Element('testsuite')
self.__suite.set('start', datetime.utcnow().isoformat(' '))

self.__e = None
self.__start_time = None
self.__results = []
self.__verbose = bool(verbosity)

@classmethod
def __getId(cls, test):
Expand All @@ -44,9 +41,6 @@ def startTest(self, test):
super().startTest(test)
self.__e = e = ET.SubElement(self.__suite, 'testcase')
self.__start_time = time.perf_counter()
if self.__verbose:
self.stream.write(f'{self.getDescription(test)} ... ')
self.stream.flush()

def _add_result(self, test, capture=False, **args):
e = self.__e
Expand Down Expand Up @@ -80,10 +74,6 @@ def _add_result(self, test, capture=False, **args):
else:
e2.text = str(v)

def __write(self, c, word):
if self.__verbose:
self.stream.write(f'{word}\n')

@classmethod
def __makeErrorDict(cls, err_type, err_value, err_tb):
if isinstance(err_type, type):
Expand All @@ -106,45 +96,26 @@ def __makeErrorDict(cls, err_type, err_value, err_tb):
def addError(self, test, err):
self._add_result(test, True, error=self.__makeErrorDict(*err))
super().addError(test, err)
self.__write('E', 'ERROR')

def addExpectedFailure(self, test, err):
self._add_result(test, True, output=self.__makeErrorDict(*err))
super().addExpectedFailure(test, err)
self.__write('x', 'expected failure')

def addFailure(self, test, err):
self._add_result(test, True, failure=self.__makeErrorDict(*err))
super().addFailure(test, err)
self.__write('F', 'FAIL')

def addSkip(self, test, reason):
self._add_result(test, skipped=reason)
super().addSkip(test, reason)
self.__write('S', f'skipped {reason!r}')

def addSuccess(self, test):
self._add_result(test)
super().addSuccess(test)
self.__write('.', 'ok')

def addUnexpectedSuccess(self, test):
self._add_result(test, outcome='UNEXPECTED_SUCCESS')
super().addUnexpectedSuccess(test)
self.__write('u', 'unexpected success')

def printErrors(self):
if self.__verbose:
self.stream.write('\n')
self.printErrorList('ERROR', self.errors)
self.printErrorList('FAIL', self.failures)

def printErrorList(self, flavor, errors):
for test, err in errors:
self.stream.write(self.separator1)
self.stream.write(f'{flavor}: {self.getDescription(test)}\n')
self.stream.write(self.separator2)
self.stream.write('%s\n' % err)

def get_xml_element(self):
e = self.__suite
Expand Down

0 comments on commit e527f79

Please sign in to comment.