Skip to content

Commit a3374f9

Browse files
committed
don't touch output of LintModuleTest->_runTest
1 parent e180e72 commit a3374f9

File tree

2 files changed

+16
-17
lines changed

2 files changed

+16
-17
lines changed

pylint/testutils/functional/lint_module_output_update.py

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,19 @@ class TestDialect(csv.excel):
2424

2525
csv.register_dialect("test", TestDialect)
2626

27-
def _check_output_text(
28-
self,
29-
_: MessageCounter,
30-
expected_output: list[OutputLine],
31-
actual_output: list[OutputLine],
32-
) -> None:
27+
def _runTest(self) -> None:
3328
"""Overwrite or remove the expected output file based on actual output."""
34-
# Remove the expected file if no output is actually emitted and a file exists
35-
if not actual_output:
36-
if os.path.exists(self._test_file.expected_output):
37-
os.remove(self._test_file.expected_output)
38-
return
39-
# Write file with expected output
40-
with open(self._test_file.expected_output, "w", encoding="utf-8") as f:
41-
writer = csv.writer(f, dialect="test")
42-
for line in actual_output:
43-
writer.writerow(line.to_csv())
29+
try:
30+
super()._runTest()
31+
finally:
32+
actual_messages, actual_output = self._get_actual()
33+
# Remove the expected file if no output is actually emitted and a file exists
34+
if not actual_output:
35+
if os.path.exists(self._test_file.expected_output):
36+
os.remove(self._test_file.expected_output)
37+
return
38+
# Write file with expected output
39+
with open(self._test_file.expected_output, "w", encoding="utf-8") as f:
40+
writer = csv.writer(f, dialect="test")
41+
for line in actual_output:
42+
writer.writerow(line.to_csv())

pylint/testutils/lint_module_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,12 +253,12 @@ def _runTest(self) -> None:
253253
self._linter.check(modules_to_check)
254254
expected_messages, expected_output = self._get_expected()
255255
actual_messages, actual_output = self._get_actual()
256-
self._check_output_text(expected_messages, expected_output, actual_output)
257256
assert (
258257
expected_messages == actual_messages
259258
), self.error_msg_for_unequal_messages(
260259
actual_messages, expected_messages, actual_output
261260
)
261+
self._check_output_text(expected_messages, expected_output, actual_output)
262262

263263
def error_msg_for_unequal_messages(
264264
self,

0 commit comments

Comments
 (0)