actions/black
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

additional fix for click 8.2.0 (#4591)

Browse Source
This commit is contained in:
Michael R. Crusoe 2025-02-27 17:46:59 +01:00 committed by GitHub
parent 452d3b68f4
commit ed64d89faa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/test_black.py
View File

@ -192,10 +192,10 @@ def test_piping(self) -> None:
input=BytesIO(source.encode("utf-8")), input=BytesIO(source.encode("utf-8")),
) )
self.assertEqual(result.exit_code, 0) self.assertEqual(result.exit_code, 0)
self.assertFormatEqual(expected, result.output) self.assertFormatEqual(expected, result.stdout)
if source != result.output: if source != result.stdout:
black.assert_equivalent(source, result.output) black.assert_equivalent(source, result.stdout)
black.assert_stable(source, result.output, DEFAULT_MODE) black.assert_stable(source, result.stdout, DEFAULT_MODE)
def test_piping_diff(self) -> None: def test_piping_diff(self) -> None:
diff_header = re.compile( diff_header = re.compile(
@ -215,7 +215,7 @@ def test_piping_diff(self) -> None:
black.main, args, input=BytesIO(source.encode("utf-8")) black.main, args, input=BytesIO(source.encode("utf-8"))
) )
self.assertEqual(result.exit_code, 0) self.assertEqual(result.exit_code, 0)
actual = diff_header.sub(DETERMINISTIC_HEADER, result.output) actual = diff_header.sub(DETERMINISTIC_HEADER, result.stdout)
actual = actual.rstrip() + "\n" # the diff output has a trailing space actual = actual.rstrip() + "\n" # the diff output has a trailing space
self.assertEqual(expected, actual) self.assertEqual(expected, actual)
@ -300,7 +300,7 @@ def test_expression_diff(self) -> None:
self.assertEqual(result.exit_code, 0) self.assertEqual(result.exit_code, 0)
finally: finally:
os.unlink(tmp_file) os.unlink(tmp_file)
actual = result.output actual = result.stdout
actual = diff_header.sub(DETERMINISTIC_HEADER, actual) actual = diff_header.sub(DETERMINISTIC_HEADER, actual)
if expected != actual: if expected != actual:
dump = black.dump_to_file(actual) dump = black.dump_to_file(actual)
@ -409,7 +409,7 @@ def test_skip_magic_trailing_comma(self) -> None:
self.assertEqual(result.exit_code, 0) self.assertEqual(result.exit_code, 0)
finally: finally:
os.unlink(tmp_file) os.unlink(tmp_file)
actual = result.output actual = result.stdout
actual = diff_header.sub(DETERMINISTIC_HEADER, actual) actual = diff_header.sub(DETERMINISTIC_HEADER, actual)
actual = actual.rstrip() + "\n" # the diff output has a trailing space actual = actual.rstrip() + "\n" # the diff output has a trailing space
if expected != actual: if expected != actual:
@ -1831,7 +1831,7 @@ def test_bpo_2142_workaround(self) -> None:
self.assertEqual(result.exit_code, 0) self.assertEqual(result.exit_code, 0)
finally: finally:
os.unlink(tmp_file) os.unlink(tmp_file)
actual = result.output actual = result.stdout
actual = diff_header.sub(DETERMINISTIC_HEADER, actual) actual = diff_header.sub(DETERMINISTIC_HEADER, actual)
self.assertEqual(actual, expected) self.assertEqual(actual, expected)
@ -1841,7 +1841,7 @@ def compare_results(
) -> None: ) -> None:
"""Helper method to test the value and exit code of a click Result.""" """Helper method to test the value and exit code of a click Result."""
assert ( assert (
result.output == expected_value result.stdout == expected_value
), "The output did not match the expected value." ), "The output did not match the expected value."
assert result.exit_code == expected_exit_code, "The exit code is incorrect." assert result.exit_code == expected_exit_code, "The exit code is incorrect."