Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
repos:
- repo: https://github.com/astral-sh/ruff-pre-commit
# Ruff version.
rev: v0.7.1
rev: v0.13.3
hooks:
# Run the linter.
- id: ruff
- id: ruff-check
# Run the formatter.
- id: ruff-format
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ line-ending = "lf"

[tool.ruff.lint]
select = ["E4", "E7", "E9", "F", "D", "I", "ANN"]
ignore = ["D100", "D104", "D417", "ANN101", "ANN102", "ANN002", "ANN003"]
ignore = ["D100", "D104", "D417", "ANN002", "ANN003"]

[tool.ruff.lint.pydocstyle]
convention = "numpy"
Expand Down
18 changes: 9 additions & 9 deletions test/test_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,22 +48,22 @@ def _():
def test_load_parser_from_dir_single_log_file(self, mocked_parse, parse_kwargs, all_kwargs, parser_files):
parser = next(parser_files)
config = {"example_file": [1]}
parser.write_text(f"{all_kwargs["config_variable"]}={config}")
parser.write_text(f"{all_kwargs['config_variable']}={config}")
log_parser.cli.run(**all_kwargs)
mocked_parse.assert_called_once_with(config, **parse_kwargs)

def test_load_parser_from_dir_multi_log_file(self, mocked_parse, parse_kwargs, all_kwargs, parser_files):
parser = next(parser_files)
config = {"example_file": [1], "example_file2": [1]}
parser.write_text(f"{all_kwargs["config_variable"]}={config}")
parser.write_text(f"{all_kwargs['config_variable']}={config}")
log_parser.cli.run(**all_kwargs)
mocked_parse.assert_called_once_with(config, **parse_kwargs)

def test_load_parsers_from_dir_single_log_file(self, mocked_parse, all_kwargs, parser_files):
n_parsers = 10
for i, parser in enumerate(itertools.islice(parser_files, n_parsers)):
config = {"example_file": [i]}
parser.write_text(f"{all_kwargs["config_variable"]}={config}")
parser.write_text(f"{all_kwargs['config_variable']}={config}")
log_parser.cli.run(**all_kwargs)
assert len(mocked_parse.call_args_list) == 1
configs = mocked_parse.call_args.kwargs.get("configs", mocked_parse.call_args.args[0])
Expand All @@ -75,7 +75,7 @@ def test_load_parsers_from_dir_multi_log_file(self, mocked_parse, all_kwargs, pa
for i, parser in enumerate(itertools.islice(parser_files, n_parsers)):
config = {f"example_file_{i}": [i]}
expected.update(config)
parser.write_text(f"{all_kwargs["config_variable"]}={config}")
parser.write_text(f"{all_kwargs['config_variable']}={config}")
log_parser.cli.run(**all_kwargs)
assert len(mocked_parse.call_args_list) == 1
configs = mocked_parse.call_args.kwargs.get("configs", mocked_parse.call_args.args[0])
Expand All @@ -86,7 +86,7 @@ def test_load_parsers_from_files(self, mocked_parse, all_kwargs, parser_files):
parsers = []
for i, parser in enumerate(itertools.islice(parser_files, n_parsers)):
config = {"example_file": [i]}
parser.write_text(f"{all_kwargs["config_variable"]}={config}")
parser.write_text(f"{all_kwargs['config_variable']}={config}")
parsers.append(parser)
all_kwargs["parsers"] = parsers
log_parser.cli.run(**all_kwargs)
Expand All @@ -105,7 +105,7 @@ def test_load_parser_no_config_constant(self, all_kwargs, parser_files):
def test_passes_poll_delay(self, mocked_parse, parse_kwargs, all_kwargs, parser_files):
parser = next(parser_files)
config = {}
parser.write_text(f"{all_kwargs["config_variable"]}={config}")
parser.write_text(f"{all_kwargs['config_variable']}={config}")
all_kwargs["poll_delay"] += 1
parse_kwargs["poll_delay"] += 1
log_parser.cli.run(**all_kwargs)
Expand All @@ -114,7 +114,7 @@ def test_passes_poll_delay(self, mocked_parse, parse_kwargs, all_kwargs, parser_
def test_passes_tail(self, mocked_parse, all_kwargs, parse_kwargs, parser_files):
parser = next(parser_files)
config = {}
parser.write_text(f"{all_kwargs["config_variable"]}={config}")
parser.write_text(f"{all_kwargs['config_variable']}={config}")
all_kwargs["tail"] = not all_kwargs["tail"]
parse_kwargs["tail"] = not parse_kwargs["tail"]
log_parser.cli.run(**all_kwargs)
Expand All @@ -123,7 +123,7 @@ def test_passes_tail(self, mocked_parse, all_kwargs, parse_kwargs, parser_files)
def test_passes_timeout(self, mocked_parse, all_kwargs, parse_kwargs, parser_files):
parser = next(parser_files)
config = {}
parser.write_text(f"{all_kwargs["config_variable"]}={config}")
parser.write_text(f"{all_kwargs['config_variable']}={config}")
all_kwargs["timeout"] = 1
parse_kwargs["timeout"] = 1
log_parser.cli.run(**all_kwargs)
Expand All @@ -132,7 +132,7 @@ def test_passes_timeout(self, mocked_parse, all_kwargs, parse_kwargs, parser_fil
def test_catches_timeout(self, mocked_parse, all_kwargs, parse_kwargs, parser_files):
parser = next(parser_files)
config = {}
parser.write_text(f"{all_kwargs["config_variable"]}={config}")
parser.write_text(f"{all_kwargs['config_variable']}={config}")
mocked_parse.side_effect = TimeoutError("test")
log_parser.cli.run(**all_kwargs)
mocked_parse.assert_called_once_with(config, **parse_kwargs)
Expand Down