From 2f649bf5c22696aef8331ab55937bf18f6822a7f Mon Sep 17 00:00:00 2001 From: Benjamin Schubert Date: Sat, 21 Oct 2023 12:53:48 +0100 Subject: [PATCH] fixup! Color the full diff that pytest shows as a diff --- testing/test_assertion.py | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/testing/test_assertion.py b/testing/test_assertion.py index bde190380..3598dfeb0 100644 --- a/testing/test_assertion.py +++ b/testing/test_assertion.py @@ -1803,13 +1803,8 @@ def test_reprcompare_verbose_long() -> None: assert [0, 1] == [0, 2] """, [ - "{bold}{red}E assert [0, 1] == [0, 2]{reset}", - "{bold}{red}E At index 1 diff: 1 != 2{reset}", - "{bold}{red}E Full diff:{reset}", "{bold}{red}E {light-red}- [0, 2]{hl-reset}{endline}{reset}", - "{bold}{red}E ? ^{endline}{reset}", "{bold}{red}E {light-green}+ [0, 1]{hl-reset}{endline}{reset}", - "{bold}{red}E ? ^{endline}{reset}", ], ), ( @@ -1820,30 +1815,9 @@ def test_reprcompare_verbose_long() -> None: } """, [ - ( - "{bold}{red}E AssertionError: assert " - "{{'number-is-1': 1, 'number-is-2': 2, 'number-is-3': 3, 'number-is-4': 4, 'number-is-5': 5}}" - " == {{'number-is-0': 0, 'number-is-1': 1, 'number-is-2': 2, 'number-is-3': 3, 'number-is-4': 4}}" - "{reset}" - ), - "{bold}{red}E Common items:{reset}", - ( - "{bold}{red}E " - "{{'number-is-1': 1, 'number-is-2': 2, 'number-is-3': 3, 'number-is-4': 4}}{reset}" - ), - "{bold}{red}E Left contains 1 more item:{reset}", - "{bold}{red}E {{'number-is-5': 5}}{reset}", - "{bold}{red}E Right contains 1 more item:{reset}", - "{bold}{red}E {{'number-is-0': 0}}{reset}", - "{bold}{red}E Full diff:{reset}", "{bold}{red}E {light-gray} {hl-reset} {{{endline}{reset}", - "{bold}{red}E {light-red}- 'number-is-0': 0,{hl-reset}{endline}{reset}", "{bold}{red}E {light-gray} {hl-reset} 'number-is-1': 1,{endline}{reset}", - "{bold}{red}E {light-gray} {hl-reset} 'number-is-2': 2,{endline}{reset}", - "{bold}{red}E {light-gray} {hl-reset} 'number-is-3': 3,{endline}{reset}", - "{bold}{red}E {light-gray} {hl-reset} 'number-is-4': 4,{endline}{reset}", "{bold}{red}E {light-green}+ 'number-is-5': 5,{hl-reset}{endline}{reset}", - "{bold}{red}E {light-gray} {hl-reset} }}{endline}{reset}", ], ), ), @@ -1861,4 +1835,4 @@ def test_comparisons_handle_colors( else color_mapping.strip_colors ) - result.stdout.fnmatch_lines(formatter(expected_lines)) + result.stdout.fnmatch_lines(formatter(expected_lines), consecutive=False)