File tree Expand file tree Collapse file tree 3 files changed +14
-15
lines changed Expand file tree Collapse file tree 3 files changed +14
-15
lines changed Original file line number Diff line number Diff line change @@ -268,6 +268,7 @@ def __call__(self) -> "FunctionState":
268
268
step (state )
269
269
270
270
if initialDescription :
271
+ state .setDescriptionFormatter (lambda descr , state : descr )
271
272
state .description = initialDescription
272
273
elif state .wasCalled :
273
274
state .description = f"{ state .getFunctionCallRepr ()} works as expected"
Original file line number Diff line number Diff line change @@ -288,7 +288,7 @@ def handleTimeoutChange(test: Test):
288
288
_activeTest = test
289
289
290
290
run = testFunction (test )
291
-
291
+
292
292
self ._sendSignal (_Signal (
293
293
isTiming = True ,
294
294
resetTimer = True ,
@@ -301,7 +301,7 @@ def handleTimeoutChange(test: Test):
301
301
_activeTest = None
302
302
303
303
self ._sendSignal (_Signal (isTiming = False ))
304
-
304
+
305
305
# return test results in specified order
306
306
sortedResults = [cachedResults [test ] for test in sorted (cachedResults )]
307
307
return [result for result in sortedResults if result is not None ]
@@ -310,7 +310,6 @@ def _sendResult(self, result: TesterResult):
310
310
self .resultQueue .put (result )
311
311
312
312
def _sendSignal (self , signal : _Signal ):
313
- #return
314
313
self .signalQueue .put (signal )
315
314
316
315
def _getTestFunctionsInExecutionOrder (self , testFunctions : Iterable [TestFunction ]) -> List [TestFunction ]:
Original file line number Diff line number Diff line change @@ -186,23 +186,22 @@ def runMethod():
186
186
with conditionalSandbox ():
187
187
try :
188
188
if getattr (self ._function , "isTestFunction" , False ):
189
- result = self ._function (test )()
189
+ self ._function (test )()
190
190
elif (len (inspect .getfullargspec (self ._function ).args ) >
191
191
1 if inspect .ismethod (self ._function ) else 0 ):
192
- result = self ._function (test )
192
+ self ._function (test )
193
193
else :
194
- result = self ._function ()
194
+ self ._function ()
195
195
196
- if result is None :
197
- if test .test != Test .test :
198
- result = test .test ()
199
- else :
200
- result = True
196
+ # support for old-style tests
197
+ hasPassed , info = True , ""
198
+ if test .test != Test .test :
199
+ result = test .test ()
201
200
202
- if type (result ) == tuple :
203
- hasPassed , info = result
204
- else :
205
- hasPassed , info = result , ""
201
+ if type (result ) == tuple :
202
+ hasPassed , info = result
203
+ else :
204
+ hasPassed = result
206
205
except AssertionError as e :
207
206
# last = traceback.extract_tb(e.__traceback__)[-1]
208
207
# print(last, dir(last), last.line, last.lineno)
You can’t perform that action at this time.
0 commit comments