Skip to content

Commit 996da9e

Browse files
authored
Rename init_linter fixture to initialized_linter, add filename (#5581)
1 parent 797d99b commit 996da9e

File tree

1 file changed

+21
-19
lines changed

1 file changed

+21
-19
lines changed

tests/lint/unittest_lint.py

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -249,9 +249,9 @@ def reporter():
249249

250250

251251
@pytest.fixture
252-
def init_linter(linter: PyLinter) -> PyLinter:
252+
def initialized_linter(linter: PyLinter) -> PyLinter:
253253
linter.open()
254-
linter.set_current_module("toto")
254+
linter.set_current_module("toto", "mydir/toto")
255255
linter.file_state = FileState("toto")
256256
return linter
257257

@@ -273,8 +273,8 @@ def visit_class(self, _):
273273
linter.check(["abc"])
274274

275275

276-
def test_enable_message(init_linter: PyLinter) -> None:
277-
linter = init_linter
276+
def test_enable_message(initialized_linter: PyLinter) -> None:
277+
linter = initialized_linter
278278
assert linter.is_message_enabled("W0101")
279279
assert linter.is_message_enabled("W0102")
280280
linter.disable("W0101", scope="package")
@@ -290,8 +290,8 @@ def test_enable_message(init_linter: PyLinter) -> None:
290290
assert linter.is_message_enabled("W0102", 1)
291291

292292

293-
def test_enable_message_category(init_linter: PyLinter) -> None:
294-
linter = init_linter
293+
def test_enable_message_category(initialized_linter: PyLinter) -> None:
294+
linter = initialized_linter
295295
assert linter.is_message_enabled("W0101")
296296
assert linter.is_message_enabled("C0202")
297297
linter.disable("W", scope="package")
@@ -309,11 +309,11 @@ def test_enable_message_category(init_linter: PyLinter) -> None:
309309
assert linter.is_message_enabled("C0202", line=1)
310310

311311

312-
def test_message_state_scope(init_linter: PyLinter) -> None:
312+
def test_message_state_scope(initialized_linter: PyLinter) -> None:
313313
class FakeConfig:
314314
confidence = ["HIGH"]
315315

316-
linter = init_linter
316+
linter = initialized_linter
317317
linter.disable("C0202")
318318
assert MSG_STATE_SCOPE_CONFIG == linter._get_message_state_scope("C0202")
319319
linter.disable("W0101", scope="module", line=3)
@@ -327,8 +327,8 @@ class FakeConfig:
327327
)
328328

329329

330-
def test_enable_message_block(init_linter: PyLinter) -> None:
331-
linter = init_linter
330+
def test_enable_message_block(initialized_linter: PyLinter) -> None:
331+
linter = initialized_linter
332332
linter.open()
333333
filepath = join(REGRTEST_DATA_DIR, "func_block_disable_msg.py")
334334
linter.set_current_module("func_block_disable_msg")
@@ -385,12 +385,12 @@ def test_enable_message_block(init_linter: PyLinter) -> None:
385385
assert fs._suppression_mapping["E1101", 110] == 109
386386

387387

388-
def test_enable_by_symbol(init_linter: PyLinter) -> None:
388+
def test_enable_by_symbol(initialized_linter: PyLinter) -> None:
389389
"""messages can be controlled by symbolic names.
390390
391391
The state is consistent across symbols and numbers.
392392
"""
393-
linter = init_linter
393+
linter = initialized_linter
394394
assert linter.is_message_enabled("W0101")
395395
assert linter.is_message_enabled("unreachable")
396396
assert linter.is_message_enabled("W0102")
@@ -652,8 +652,10 @@ def test_full_documentation(linter: PyLinter) -> None:
652652
assert re.search(regexp, output)
653653

654654

655-
def test_list_msgs_enabled(init_linter: PyLinter, capsys: CaptureFixture) -> None:
656-
linter = init_linter
655+
def test_list_msgs_enabled(
656+
initialized_linter: PyLinter, capsys: CaptureFixture
657+
) -> None:
658+
linter = initialized_linter
657659
linter.enable("W0101", scope="package")
658660
linter.disable("W0102", scope="package")
659661
linter.list_messages_enabled()
@@ -865,12 +867,12 @@ def test_multiprocessing(jobs: int) -> None:
865867
assert len(messages) == len(set(messages))
866868

867869

868-
def test_filename_with__init__(init_linter: PyLinter) -> None:
870+
def test_filename_with__init__(initialized_linter: PyLinter) -> None:
869871
# This tracks a regression where a file whose name ends in __init__.py,
870872
# such as flycheck__init__.py, would accidentally lead to linting the
871873
# entire containing directory.
872874
reporter = testutils.GenericTestReporter()
873-
linter = init_linter
875+
linter = initialized_linter
874876
linter.open()
875877
linter.set_reporter(reporter)
876878
filepath = join(INPUT_DIR, "not__init__.py")
@@ -879,15 +881,15 @@ def test_filename_with__init__(init_linter: PyLinter) -> None:
879881
assert len(messages) == 0
880882

881883

882-
def test_by_module_statement_value(init_linter: PyLinter) -> None:
884+
def test_by_module_statement_value(initialized_linter: PyLinter) -> None:
883885
"""Test "statement" for each module analyzed of computed correctly."""
884-
linter = init_linter
886+
linter = initialized_linter
885887
linter.check([os.path.join(os.path.dirname(__file__), "data")])
886888

887889
by_module_stats = linter.stats.by_module
888890
for module, module_stats in by_module_stats.items():
889891

890-
linter2 = init_linter
892+
linter2 = initialized_linter
891893
if module == "data":
892894
linter2.check([os.path.join(os.path.dirname(__file__), "data/__init__.py")])
893895
else:

0 commit comments

Comments
 (0)