@@ -84,18 +84,13 @@ def run_cli(
84
84
85
85
self .assertEqual (
86
86
actual_exit_code , exit_code , msg = dedent (
87
- """
88
- Expected an exit code of {} != {}.
87
+ f """
88
+ Expected an exit code of { exit_code } != { actual_exit_code } .
89
89
90
- stdout: {}
90
+ stdout: { stdout . getvalue () }
91
91
92
- stderr: {}
93
- """ .format (
94
- exit_code ,
95
- actual_exit_code ,
96
- stdout .getvalue (),
97
- stderr .getvalue (),
98
- ),
92
+ stderr: { stderr .getvalue ()}
93
+ """ ,
99
94
),
100
95
)
101
96
return stdout .getvalue (), stderr .getvalue ()
@@ -450,9 +445,9 @@ def test_instance_is_invalid_JSON(self):
450
445
argv = ["-i" , "some_instance" , "some_schema" ],
451
446
452
447
exit_code = 1 ,
453
- stderr = """\
454
- Failed to parse 'some_instance': {}
455
- """ . format ( _message_for ( instance )) ,
448
+ stderr = f """\
449
+ Failed to parse 'some_instance': { _message_for ( instance ) }
450
+ """ ,
456
451
)
457
452
458
453
def test_instance_is_invalid_JSON_pretty_output (self ):
@@ -483,9 +478,9 @@ def test_instance_is_invalid_JSON_on_stdin(self):
483
478
argv = ["some_schema" ],
484
479
485
480
exit_code = 1 ,
486
- stderr = """\
487
- Failed to parse <stdin>: {}
488
- """ . format ( _message_for ( instance )) ,
481
+ stderr = f """\
482
+ Failed to parse <stdin>: { _message_for ( instance ) }
483
+ """ ,
489
484
)
490
485
491
486
def test_instance_is_invalid_JSON_on_stdin_pretty_output (self ):
@@ -513,9 +508,9 @@ def test_schema_is_invalid_JSON(self):
513
508
argv = ["some_schema" ],
514
509
515
510
exit_code = 1 ,
516
- stderr = """\
517
- Failed to parse 'some_schema': {}
518
- """ . format ( _message_for ( schema )) ,
511
+ stderr = f """\
512
+ Failed to parse 'some_schema': { _message_for ( schema ) }
513
+ """ ,
519
514
)
520
515
521
516
def test_schema_is_invalid_JSON_pretty_output (self ):
@@ -543,9 +538,9 @@ def test_schema_and_instance_are_both_invalid_JSON(self):
543
538
argv = ["some_schema" ],
544
539
545
540
exit_code = 1 ,
546
- stderr = """\
547
- Failed to parse 'some_schema': {}
548
- """ . format ( _message_for ( schema )) ,
541
+ stderr = f """\
542
+ Failed to parse 'some_schema': { _message_for ( schema ) }
543
+ """ ,
549
544
)
550
545
551
546
def test_schema_and_instance_are_both_invalid_JSON_pretty_output (self ):
0 commit comments