@@ -318,7 +318,7 @@ def message(self) -> str:
318
318
if len (self ._inputs_parameters [i ]) > 0 :
319
319
message += Formatter .color_assert_success (" for input\n " )
320
320
321
- message + = "\n " .join (
321
+ input_parameters_message = "\n " .join (
322
322
[
323
323
f" { Formatter .color_assert_info (param_name )} : "
324
324
f"{ param_value !r} "
@@ -327,57 +327,51 @@ def message(self) -> str:
327
327
].items ()
328
328
]
329
329
)
330
+ if input_parameters_message != "" :
331
+ message += input_parameters_message
330
332
else :
331
333
message = Formatter .color_assert_failed (
332
334
f"{ self ._assert_names [i ]} failed" ,
333
335
)
334
- if len (self ._inputs_parameters [i ]) > 0 :
335
- message += Formatter .color_assert_failed (" for input\n " )
336
- elif (isinstance (result , tuple ) and len (result ) == 3 ) or not (
336
+ if len (self ._inputs_parameters [i ]) > 0 or not (
337
337
self ._suppress_assert_messages [i ]
338
338
):
339
- message += " \n "
339
+ message += Formatter . color_assert_failed ( " for \n ")
340
340
341
- message + = "\n " .join (
341
+ input_parameters_message = "\n " .join (
342
342
[
343
- f" { Formatter .color_assert_info (param_name )} : "
343
+ f" { Formatter .color_assert_info (param_name )} : "
344
344
f"{ param_value !r} "
345
345
for param_name , param_value in self ._inputs_parameters [
346
346
i
347
347
].items ()
348
348
]
349
349
)
350
+ assert_message = ""
351
+ if input_parameters_message != "" :
352
+ assert_message += input_parameters_message
350
353
354
+ assert_result = ""
351
355
if isinstance (result , tuple ) and len (result ) == 3 :
352
- if len (self ._inputs_parameters [i ]) > 0 :
353
- message += "\n "
356
+ # Execution info
354
357
tb = IPython .core .ultratb .VerboseTB ()
355
- message = Formatter .color_assert_failed (
356
- f"{ self ._assert_names [i ]} failed\n "
357
- )
358
358
assert_result = tb .text (* result )
359
- assert_result = re .sub (
360
- r"(^)" ,
361
- r"\1" + f"{ Formatter .color_assert_failed ('|' )} " ,
362
- assert_result ,
363
- flags = re .M ,
364
- )
365
- message += assert_result
366
359
elif not (self ._suppress_assert_messages [i ]):
367
- if len (self ._inputs_parameters [i ]) > 0 :
368
- message += "\n "
369
360
if hasattr (result , "message" ):
370
361
assert_result = f"{ result .message ()} "
371
362
else :
372
363
assert_result = f"{ Formatter .color_assert_failed (result )} "
364
+ if assert_result != "" :
365
+ assert_message += "\n " + assert_result
366
+ if assert_message != "" :
373
367
# adds "| " to the beginning of each line
374
- assert_result = re .sub (
368
+ assert_message = re .sub (
375
369
r"(^)" ,
376
370
r"\1" + f"{ Formatter .color_assert_failed ('|' )} " ,
377
- assert_result ,
371
+ assert_message ,
378
372
flags = re .M ,
379
373
)
380
- message += f"{ assert_result } "
374
+ message += f"{ assert_message } "
381
375
messages .append (message )
382
376
383
377
return "\n " .join (messages )
@@ -459,8 +453,8 @@ def message(self) -> str:
459
453
message = ""
460
454
for i in range (len (self ._parameter_indices )):
461
455
message += (
462
- Formatter .color_assert_failed (f"output { self ._parameter_indices [i ]} : " )
463
- + Formatter . color_assert_failed ( f"{ self ._parameter_values [i ]} \n " )
456
+ Formatter .color_assert_info (f"> output { self ._parameter_indices [i ]} : " )
457
+ + f"{ self ._parameter_values [i ]} \n "
464
458
+ Formatter .color_assert_failed (self ._messages [i ])
465
459
)
466
460
return message
0 commit comments