From 93ed73f700e1f6da32418b0188c2a8f8122f1c0d Mon Sep 17 00:00:00 2001 From: Cody Logan Date: Tue, 24 Oct 2023 11:00:56 -0700 Subject: Use per-module loggers and tweak initial log config --- tests/test_dl.py | 4 ++-- tests/test_logging.py | 15 +++++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) (limited to 'tests') diff --git a/tests/test_dl.py b/tests/test_dl.py index fc68733..839cdee 100644 --- a/tests/test_dl.py +++ b/tests/test_dl.py @@ -29,7 +29,7 @@ from wikiget.wikiget import construct_parser class TestQueryApi: parser = construct_parser() - def test_query_api(self, caplog): + def test_query_api(self, caplog: pytest.LogCaptureFixture) -> None: caplog.set_level(logging.DEBUG) args = self.parser.parse_args(["File:Example.jpg"]) file, site = query_api("Example.jpg", "commons.wikimedia.org", args) @@ -40,7 +40,7 @@ class TestQueryApi: class TestPrepDownload: parser = construct_parser() - def test_prep_download(self): + def test_prep_download(self) -> None: args = self.parser.parse_args(["File:Example.jpg"]) file = prep_download(args.FILE, args) assert file is not None diff --git a/tests/test_logging.py b/tests/test_logging.py index 3c386e4..d02df62 100644 --- a/tests/test_logging.py +++ b/tests/test_logging.py @@ -16,6 +16,9 @@ # along with Wikiget. If not, see . import logging +from pathlib import Path + +from pytest import LogCaptureFixture from wikiget.logging import FileLogAdapter, configure_logging from wikiget.wikiget import construct_parser @@ -23,7 +26,7 @@ from wikiget.wikiget import construct_parser logger = logging.getLogger() -def test_custom_log_adapter(caplog): +def test_custom_log_adapter(caplog: LogCaptureFixture) -> None: args = construct_parser().parse_args(["File:Example.jpg"]) configure_logging(args.verbose, args.logfile, quiet=args.quiet) adapter = FileLogAdapter(logger, {"filename": "Example.jpg"}) @@ -31,7 +34,7 @@ def test_custom_log_adapter(caplog): assert "[Example.jpg] test log" in caplog.text -def test_file_logging(tmp_path): +def test_file_logging(tmp_path: Path) -> None: logfile_location = tmp_path / "test.log" args = construct_parser().parse_args( ["File:Example.jpg", "-l", str(logfile_location)] @@ -40,7 +43,7 @@ def test_file_logging(tmp_path): assert logfile_location.is_file() -def test_default_logging(): +def test_default_logging() -> None: args = construct_parser().parse_args(["File:Example.jpg"]) configure_logging(args.verbose, args.logfile, quiet=args.quiet) # each call of configure_logging() adds a new handler to the logger, so we need to @@ -49,21 +52,21 @@ def test_default_logging(): assert handler.level == logging.WARNING -def test_verbose_logging(): +def test_verbose_logging() -> None: args = construct_parser().parse_args(["File:Example.jpg", "-v"]) configure_logging(args.verbose, args.logfile, quiet=args.quiet) handler = logger.handlers[-1] assert handler.level == logging.INFO -def test_very_verbose_logging(): +def test_very_verbose_logging() -> None: args = construct_parser().parse_args(["File:Example.jpg", "-vv"]) configure_logging(args.verbose, args.logfile, quiet=args.quiet) handler = logger.handlers[-1] assert handler.level == logging.DEBUG -def test_quiet_logging(): +def test_quiet_logging() -> None: args = construct_parser().parse_args(["File:Example.jpg", "-q"]) configure_logging(args.verbose, args.logfile, quiet=args.quiet) handler = logger.handlers[-1] -- cgit v1.2.3