10
10
import unittest
11
11
12
12
class RegressionTestResult (unittest .TextTestResult ):
13
- separator1 = '=' * 70 + '\n '
14
- separator2 = '-' * 70 + '\n '
15
13
USE_XML = False
16
14
17
15
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 )
19
18
self .buffer = True
20
19
if self .USE_XML :
21
20
from xml .etree import ElementTree as ET
@@ -25,8 +24,6 @@ def __init__(self, stream, descriptions, verbosity):
25
24
self .__suite .set ('start' , datetime .utcnow ().isoformat (' ' ))
26
25
self .__e = None
27
26
self .__start_time = None
28
- self .__results = []
29
- self .__verbose = bool (verbosity )
30
27
31
28
@classmethod
32
29
def __getId (cls , test ):
@@ -45,9 +42,6 @@ def startTest(self, test):
45
42
if self .USE_XML :
46
43
self .__e = e = self .__ET .SubElement (self .__suite , 'testcase' )
47
44
self .__start_time = time .perf_counter ()
48
- if self .__verbose :
49
- self .stream .write (f'{ self .getDescription (test )} ... ' )
50
- self .stream .flush ()
51
45
52
46
def _add_result (self , test , capture = False , ** args ):
53
47
if not self .USE_XML :
@@ -85,10 +79,6 @@ def _add_result(self, test, capture=False, **args):
85
79
else :
86
80
e2 .text = str (v )
87
81
88
- def __write (self , c , word ):
89
- if self .__verbose :
90
- self .stream .write (f'{ word } \n ' )
91
-
92
82
@classmethod
93
83
def __makeErrorDict (cls , err_type , err_value , err_tb ):
94
84
if isinstance (err_type , type ):
@@ -111,45 +101,26 @@ def __makeErrorDict(cls, err_type, err_value, err_tb):
111
101
def addError (self , test , err ):
112
102
self ._add_result (test , True , error = self .__makeErrorDict (* err ))
113
103
super ().addError (test , err )
114
- self .__write ('E' , 'ERROR' )
115
104
116
105
def addExpectedFailure (self , test , err ):
117
106
self ._add_result (test , True , output = self .__makeErrorDict (* err ))
118
107
super ().addExpectedFailure (test , err )
119
- self .__write ('x' , 'expected failure' )
120
108
121
109
def addFailure (self , test , err ):
122
110
self ._add_result (test , True , failure = self .__makeErrorDict (* err ))
123
111
super ().addFailure (test , err )
124
- self .__write ('F' , 'FAIL' )
125
112
126
113
def addSkip (self , test , reason ):
127
114
self ._add_result (test , skipped = reason )
128
115
super ().addSkip (test , reason )
129
- self .__write ('S' , f'skipped { reason !r} ' )
130
116
131
117
def addSuccess (self , test ):
132
118
self ._add_result (test )
133
119
super ().addSuccess (test )
134
- self .__write ('.' , 'ok' )
135
120
136
121
def addUnexpectedSuccess (self , test ):
137
122
self ._add_result (test , outcome = 'UNEXPECTED_SUCCESS' )
138
123
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 )
153
124
154
125
def get_xml_element (self ):
155
126
if not self .USE_XML :
0 commit comments