Skip to content

Commit 273c743

Browse files
committed
dropped support for return bool, only assert
1 parent c76e9df commit 273c743

File tree

3 files changed

+14
-15
lines changed

3 files changed

+14
-15
lines changed

checkpy/lib/declarative.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,7 @@ def __call__(self) -> "FunctionState":
268268
step(state)
269269

270270
if initialDescription:
271+
state.setDescriptionFormatter(lambda descr, state: descr)
271272
state.description = initialDescription
272273
elif state.wasCalled:
273274
state.description = f"{state.getFunctionCallRepr()} works as expected"

checkpy/tester/tester.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ def handleTimeoutChange(test: Test):
288288
_activeTest = test
289289

290290
run = testFunction(test)
291-
291+
292292
self._sendSignal(_Signal(
293293
isTiming=True,
294294
resetTimer=True,
@@ -301,7 +301,7 @@ def handleTimeoutChange(test: Test):
301301
_activeTest = None
302302

303303
self._sendSignal(_Signal(isTiming=False))
304-
304+
305305
# return test results in specified order
306306
sortedResults = [cachedResults[test] for test in sorted(cachedResults)]
307307
return [result for result in sortedResults if result is not None]
@@ -310,7 +310,6 @@ def _sendResult(self, result: TesterResult):
310310
self.resultQueue.put(result)
311311

312312
def _sendSignal(self, signal: _Signal):
313-
#return
314313
self.signalQueue.put(signal)
315314

316315
def _getTestFunctionsInExecutionOrder(self, testFunctions: Iterable[TestFunction]) -> List[TestFunction]:

checkpy/tests.py

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -186,23 +186,22 @@ def runMethod():
186186
with conditionalSandbox():
187187
try:
188188
if getattr(self._function, "isTestFunction", False):
189-
result = self._function(test)()
189+
self._function(test)()
190190
elif (len(inspect.getfullargspec(self._function).args) >
191191
1 if inspect.ismethod(self._function) else 0):
192-
result = self._function(test)
192+
self._function(test)
193193
else:
194-
result = self._function()
194+
self._function()
195195

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()
201200

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
206205
except AssertionError as e:
207206
# last = traceback.extract_tb(e.__traceback__)[-1]
208207
# print(last, dir(last), last.line, last.lineno)

0 commit comments

Comments
 (0)