Skip to content

Commit 3b96ef8

Browse files
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent 1ef581a commit 3b96ef8

12 files changed

Lines changed: 81 additions & 48 deletions

tests/unit/command_runner/test_command_runner.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
from unittest.mock import MagicMock
88
from unittest.mock import patch
99

10-
import pytest
11-
1210
from ansible_navigator.command_runner.command_runner import Command
1311
from ansible_navigator.command_runner.command_runner import CommandRunner
1412
from ansible_navigator.command_runner.command_runner import run_command
@@ -84,7 +82,10 @@ def test_success(self, mock_run: MagicMock) -> None:
8482
def test_failure(self, mock_run: MagicMock) -> None:
8583
"""Test run_command with CalledProcessError."""
8684
mock_run.side_effect = subprocess.CalledProcessError(
87-
returncode=1, cmd="false", output="out", stderr="err",
85+
returncode=1,
86+
cmd="false",
87+
output="out",
88+
stderr="err",
8889
)
8990

9091
cmd = Command(identity="t", command="false", post_process=_noop)

tests/unit/test_content_defs.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
from dataclasses import dataclass
66

7-
from ansible_navigator.content_defs import CFormat
87
from ansible_navigator.content_defs import ContentBase
98
from ansible_navigator.content_defs import ContentFormat
109
from ansible_navigator.content_defs import ContentView

tests/unit/test_image_introspection_parsers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def test_leading_space(self) -> None:
5757

5858
def test_regex_separator(self) -> None:
5959
"""Test with regex separator."""
60-
key, delim, content = CmdParser.re_partition("key: value", r":\s+")
60+
key, _delim, content = CmdParser.re_partition("key: value", r":\s+")
6161
assert key == "key"
6262
assert content == "value"
6363

tests/unit/test_steps.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import pytest
66

77
from ansible_navigator.steps import Step
8-
from ansible_navigator.steps import StepType
98
from ansible_navigator.steps import Steps
9+
from ansible_navigator.steps import StepType
1010
from ansible_navigator.steps import TypedStep
1111

1212

tests/unit/ui_framework/test_validators.py

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from __future__ import annotations
44

55
from dataclasses import dataclass
6-
from pathlib import Path
6+
from typing import TYPE_CHECKING
77

88
import pytest
99

@@ -12,6 +12,10 @@
1212
from ansible_navigator.ui_framework.validators import Validation
1313

1414

15+
if TYPE_CHECKING:
16+
from pathlib import Path
17+
18+
1519
class TestFieldValidatorsHttp:
1620
"""Tests for the http validator."""
1721

@@ -362,7 +366,9 @@ def test_valid_selection(self) -> None:
362366
"""Test valid number of selections."""
363367
choices = [MockCheckbox(checked=True), MockCheckbox(checked=False)]
364368
result = FieldValidators.some_of_or_none(
365-
choices=choices, min_selected=1, max_selected=2,
369+
choices=choices,
370+
min_selected=1,
371+
max_selected=2,
366372
)
367373
assert isinstance(result, Validation)
368374
assert result.error_msg == ""
@@ -371,7 +377,9 @@ def test_too_few_selected(self) -> None:
371377
"""Test too few selections."""
372378
choices = [MockCheckbox(checked=False), MockCheckbox(checked=False)]
373379
result = FieldValidators.some_of_or_none(
374-
choices=choices, min_selected=1, max_selected=2,
380+
choices=choices,
381+
min_selected=1,
382+
max_selected=2,
375383
)
376384
assert isinstance(result, Validation)
377385
assert result.error_msg != ""
@@ -382,7 +390,9 @@ def test_type_error(self) -> None:
382390

383391
with pytest.raises(TypeError):
384392
FieldValidators.some_of_or_none(
385-
choices=unknown, min_selected=unknown, max_selected=unknown,
393+
choices=unknown,
394+
min_selected=unknown,
395+
max_selected=unknown,
386396
)
387397

388398

tests/unit/utils/test_ansi.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22

33
from __future__ import annotations
44

5-
import sys
6-
7-
from unittest.mock import patch
8-
95
import pytest
106

117
from ansible_navigator.utils.ansi import blank_line
@@ -136,6 +132,7 @@ def test_prompt_enter(monkeypatch: pytest.MonkeyPatch) -> None:
136132

137133
def test_prompt_enter_keyboard_interrupt(monkeypatch: pytest.MonkeyPatch) -> None:
138134
"""Test prompt_enter exits on KeyboardInterrupt."""
135+
139136
def raise_keyboard_interrupt(_: str) -> None:
140137
raise KeyboardInterrupt
141138

@@ -165,6 +162,7 @@ def test_prompt_yn_no(monkeypatch: pytest.MonkeyPatch) -> None:
165162

166163
def test_prompt_yn_keyboard_interrupt(monkeypatch: pytest.MonkeyPatch) -> None:
167164
"""Test prompt_yn exits on KeyboardInterrupt."""
165+
168166
def raise_keyboard_interrupt(_: str) -> None:
169167
raise KeyboardInterrupt
170168

tests/unit/utils/test_definitions.py

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -126,28 +126,34 @@ def test_single_message(self) -> None:
126126

127127
def test_multiple_same_prefix(self) -> None:
128128
"""Test with multiple messages of same prefix."""
129-
msgs = ExitMessages(messages=[
130-
ExitMessage(message="err1"),
131-
ExitMessage(message="err2"),
132-
])
129+
msgs = ExitMessages(
130+
messages=[
131+
ExitMessage(message="err1"),
132+
ExitMessage(message="err2"),
133+
]
134+
)
133135
result = msgs.to_strings(color=False, width=80)
134136
assert len(result) >= 2
135137

136138
def test_different_prefixes_with_separator(self) -> None:
137139
"""Test messages with different prefixes get separator."""
138-
msgs = ExitMessages(messages=[
139-
ExitMessage(message="error", prefix=ExitPrefix.ERROR),
140-
ExitMessage(message="note", prefix=ExitPrefix.NOTE),
141-
])
140+
msgs = ExitMessages(
141+
messages=[
142+
ExitMessage(message="error", prefix=ExitPrefix.ERROR),
143+
ExitMessage(message="note", prefix=ExitPrefix.NOTE),
144+
]
145+
)
142146
result = msgs.to_strings(color=False, width=80)
143147
assert "" in result
144148

145149
def test_hint_follows_without_break(self) -> None:
146150
"""Test hint after error doesn't get blank line separator."""
147-
msgs = ExitMessages(messages=[
148-
ExitMessage(message="error", prefix=ExitPrefix.ERROR),
149-
ExitMessage(message="try this", prefix=ExitPrefix.HINT),
150-
])
151+
msgs = ExitMessages(
152+
messages=[
153+
ExitMessage(message="error", prefix=ExitPrefix.ERROR),
154+
ExitMessage(message="try this", prefix=ExitPrefix.HINT),
155+
]
156+
)
151157
result = msgs.to_strings(color=False, width=80)
152158
assert "" not in result
153159

tests/unit/utils/test_functions_extended.py

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44

55
import shutil
66

7-
from pathlib import Path
8-
from typing import Any
7+
from typing import TYPE_CHECKING
98
from unittest.mock import patch
109

1110
import pytest
@@ -29,6 +28,10 @@
2928
from ansible_navigator.utils.functions import to_list
3029

3130

31+
if TYPE_CHECKING:
32+
from pathlib import Path
33+
34+
3235
def test_check_for_ansible_found(monkeypatch: pytest.MonkeyPatch) -> None:
3336
"""Test check_for_ansible when ansible-playbook is found."""
3437
monkeypatch.setattr(shutil, "which", lambda _: "/usr/bin/ansible-playbook")
@@ -71,7 +74,9 @@ def test_clear_screen_vscode(
7174
"""Test clear_screen prints blank lines in vscode terminal."""
7275
monkeypatch.setenv("TERM_PROGRAM", "vscode")
7376
fake_size = type("TermSize", (), {"lines": 5, "columns": 80})()
74-
with patch("ansible_navigator.utils.functions.shutil.get_terminal_size", return_value=fake_size):
77+
with patch(
78+
"ansible_navigator.utils.functions.shutil.get_terminal_size", return_value=fake_size
79+
):
7580
clear_screen()
7681
captured = capsys.readouterr()
7782
assert captured.out.count("\n") == 5
@@ -91,22 +96,28 @@ def test_clear_screen_normal(
9196
def test_console_width_small() -> None:
9297
"""Test console_width with small terminal."""
9398
fake_size = type("TermSize", (), {"columns": 60})()
94-
with patch("ansible_navigator.utils.functions.shutil.get_terminal_size", return_value=fake_size):
99+
with patch(
100+
"ansible_navigator.utils.functions.shutil.get_terminal_size", return_value=fake_size
101+
):
95102
assert console_width() == 60
96103

97104

98105
def test_console_width_medium() -> None:
99106
"""Test console_width with medium terminal."""
100107
fake_size = type("TermSize", (), {"columns": 120})()
101-
with patch("ansible_navigator.utils.functions.shutil.get_terminal_size", return_value=fake_size):
108+
with patch(
109+
"ansible_navigator.utils.functions.shutil.get_terminal_size", return_value=fake_size
110+
):
102111
result = console_width()
103112
assert 80 <= result <= 120
104113

105114

106115
def test_console_width_large() -> None:
107116
"""Test console_width with large terminal."""
108117
fake_size = type("TermSize", (), {"columns": 200})()
109-
with patch("ansible_navigator.utils.functions.shutil.get_terminal_size", return_value=fake_size):
118+
with patch(
119+
"ansible_navigator.utils.functions.shutil.get_terminal_size", return_value=fake_size
120+
):
110121
assert console_width() == 132
111122

112123

@@ -261,7 +272,7 @@ def test_templar_simple() -> None:
261272

262273
def test_templar_error() -> None:
263274
"""Test templar with undefined variable."""
264-
errors, result = templar("{{ undefined_var }}", {})
275+
errors, _result = templar("{{ undefined_var }}", {})
265276
assert len(errors) > 0
266277

267278

tests/unit/utils/test_json_schema.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,12 @@ def test_invalid_data(self) -> None:
117117

118118
def test_schema_as_json_string(self) -> None:
119119
"""Test validate with schema as JSON string."""
120-
schema_str = json.dumps({
121-
"type": "object",
122-
"properties": {"age": {"type": "integer"}},
123-
})
120+
schema_str = json.dumps(
121+
{
122+
"type": "object",
123+
"properties": {"age": {"type": "integer"}},
124+
}
125+
)
124126
errors = validate(schema_str, {"age": 25})
125127
assert errors == []
126128

tests/unit/utils/test_key_value_store_extended.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,17 @@
22

33
from __future__ import annotations
44

5-
from pathlib import Path
5+
from typing import TYPE_CHECKING
66

77
import pytest
88

99
from ansible_navigator.utils.key_value_store import KeyValueStore
1010

1111

12+
if TYPE_CHECKING:
13+
from pathlib import Path
14+
15+
1216
@pytest.fixture
1317
def kvs(tmp_path: Path) -> KeyValueStore:
1418
"""Provide a fresh KeyValueStore instance.

0 commit comments

Comments
 (0)