Skip to content

Commit 3d56272

Browse files
bpo-45057: Simplify RegressionTestResult (GH-28081) (GH-28101)
Remove code which duplicates the functionality of TextTestResult. (cherry picked from commit 2b76a53) Co-authored-by: Serhiy Storchaka <[email protected]>
1 parent 0f274cb commit 3d56272

File tree

1 file changed

+2
-31
lines changed

1 file changed

+2
-31
lines changed

Lib/test/support/testresult.py

+2-31
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,11 @@
1010
import unittest
1111

1212
class RegressionTestResult(unittest.TextTestResult):
13-
separator1 = '=' * 70 + '\n'
14-
separator2 = '-' * 70 + '\n'
1513
USE_XML = False
1614

1715
def __init__(self, stream, descriptions, verbosity):
18-
super().__init__(stream=stream, descriptions=descriptions, verbosity=0)
16+
super().__init__(stream=stream, descriptions=descriptions,
17+
verbosity=2 if verbosity else 0)
1918
self.buffer = True
2019
if self.USE_XML:
2120
from xml.etree import ElementTree as ET
@@ -25,8 +24,6 @@ def __init__(self, stream, descriptions, verbosity):
2524
self.__suite.set('start', datetime.utcnow().isoformat(' '))
2625
self.__e = None
2726
self.__start_time = None
28-
self.__results = []
29-
self.__verbose = bool(verbosity)
3027

3128
@classmethod
3229
def __getId(cls, test):
@@ -45,9 +42,6 @@ def startTest(self, test):
4542
if self.USE_XML:
4643
self.__e = e = self.__ET.SubElement(self.__suite, 'testcase')
4744
self.__start_time = time.perf_counter()
48-
if self.__verbose:
49-
self.stream.write(f'{self.getDescription(test)} ... ')
50-
self.stream.flush()
5145

5246
def _add_result(self, test, capture=False, **args):
5347
if not self.USE_XML:
@@ -85,10 +79,6 @@ def _add_result(self, test, capture=False, **args):
8579
else:
8680
e2.text = str(v)
8781

88-
def __write(self, c, word):
89-
if self.__verbose:
90-
self.stream.write(f'{word}\n')
91-
9282
@classmethod
9383
def __makeErrorDict(cls, err_type, err_value, err_tb):
9484
if isinstance(err_type, type):
@@ -111,45 +101,26 @@ def __makeErrorDict(cls, err_type, err_value, err_tb):
111101
def addError(self, test, err):
112102
self._add_result(test, True, error=self.__makeErrorDict(*err))
113103
super().addError(test, err)
114-
self.__write('E', 'ERROR')
115104

116105
def addExpectedFailure(self, test, err):
117106
self._add_result(test, True, output=self.__makeErrorDict(*err))
118107
super().addExpectedFailure(test, err)
119-
self.__write('x', 'expected failure')
120108

121109
def addFailure(self, test, err):
122110
self._add_result(test, True, failure=self.__makeErrorDict(*err))
123111
super().addFailure(test, err)
124-
self.__write('F', 'FAIL')
125112

126113
def addSkip(self, test, reason):
127114
self._add_result(test, skipped=reason)
128115
super().addSkip(test, reason)
129-
self.__write('S', f'skipped {reason!r}')
130116

131117
def addSuccess(self, test):
132118
self._add_result(test)
133119
super().addSuccess(test)
134-
self.__write('.', 'ok')
135120

136121
def addUnexpectedSuccess(self, test):
137122
self._add_result(test, outcome='UNEXPECTED_SUCCESS')
138123
super().addUnexpectedSuccess(test)
139-
self.__write('u', 'unexpected success')
140-
141-
def printErrors(self):
142-
if self.__verbose:
143-
self.stream.write('\n')
144-
self.printErrorList('ERROR', self.errors)
145-
self.printErrorList('FAIL', self.failures)
146-
147-
def printErrorList(self, flavor, errors):
148-
for test, err in errors:
149-
self.stream.write(self.separator1)
150-
self.stream.write(f'{flavor}: {self.getDescription(test)}\n')
151-
self.stream.write(self.separator2)
152-
self.stream.write('%s\n' % err)
153124

154125
def get_xml_element(self):
155126
if not self.USE_XML:

0 commit comments

Comments
 (0)