From 1f3013fae31a1419bc0bccb91511dd95571668f5 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Nov 10 2022 09:59:42 +0000 Subject: cli: stop using log.info for normal output logging should not be used for normal output because that output must be always printed to stdout, and the whole point of logging is to potentially redirect or suppress auxiliary messages. Signed-off-by: Zbigniew Jędrzejewski-Szmek --- diff --git a/rpmautospec/subcommands/changelog.py b/rpmautospec/subcommands/changelog.py index 46dfcd8..b38860e 100644 --- a/rpmautospec/subcommands/changelog.py +++ b/rpmautospec/subcommands/changelog.py @@ -1,12 +1,8 @@ -import logging from typing import Any, Dict, Optional, Union from ..pkg_history import PkgHistoryProcessor -log = logging.getLogger(__name__) - - def register_subcommand(subparsers): subcmd_name = "generate-changelog" @@ -57,4 +53,4 @@ def produce_changelog(spec_or_repo): def main(args): """Main method.""" changelog = produce_changelog(args.spec_or_path) - log.info(changelog) + print(changelog) diff --git a/rpmautospec/subcommands/release.py b/rpmautospec/subcommands/release.py index 0a1c0fe..a435bda 100644 --- a/rpmautospec/subcommands/release.py +++ b/rpmautospec/subcommands/release.py @@ -1,13 +1,9 @@ -import logging from pathlib import Path from typing import Union from ..pkg_history import PkgHistoryProcessor -log = logging.getLogger(__name__) - - def register_subcommand(subparsers): subcmd_name = "calculate-release" @@ -75,4 +71,4 @@ def calculate_release_number(spec_or_path: Union[str, Path]) -> int: def main(args): """Main method.""" release = calculate_release(args.spec_or_path, complete_release=args.complete_release) - log.info("calculate_release release: %s", release) + print("calculate_release release:", release) diff --git a/tests/rpmautospec/subcommands/test_release.py b/tests/rpmautospec/subcommands/test_release.py index 5614783..9b42a98 100644 --- a/tests/rpmautospec/subcommands/test_release.py +++ b/tests/rpmautospec/subcommands/test_release.py @@ -1,4 +1,3 @@ -import logging import os.path import tarfile import tempfile @@ -17,7 +16,7 @@ class TestRelease: """Test the rpmautospec.subcommands.release module""" @pytest.mark.parametrize("method_to_test", ("calculate_release", "main")) - def test_calculate_release(self, method_to_test, caplog): + def test_calculate_release(self, method_to_test, capsys): with tempfile.TemporaryDirectory() as workdir: with tarfile.open( os.path.join( @@ -38,8 +37,9 @@ class TestRelease: if method_to_test == "calculate_release": assert release.calculate_release(unpacked_repo_dir) == expected_release else: - with caplog.at_level(logging.INFO): - args = mock.Mock() - args.spec_or_path = unpacked_repo_dir - release.main(args) - assert f"calculate_release release: {expected_release}" in caplog.text + args = mock.Mock() + args.spec_or_path = unpacked_repo_dir + release.main(args) + + captured = capsys.readouterr() + assert f"calculate_release release: {expected_release}" in captured.out