replace no-log with quiet

Also behavior of the flag has been changed: now it disables logs at all
This commit is contained in:
2021-10-03 01:59:23 +03:00
parent a4eaf87116
commit edef4944f6
8 changed files with 43 additions and 43 deletions

View File

@ -14,7 +14,7 @@ def test_call(args: argparse.Namespace, mocker: MockerFixture) -> None:
must call inside lock
"""
args.configuration = Path("")
args.no_log = False
args.quiet = False
mocker.patch("ahriman.application.handlers.Handler.run")
mocker.patch("ahriman.core.configuration.Configuration.from_path")
enter_mock = mocker.patch("ahriman.application.lock.Lock.__enter__")

View File

@ -79,7 +79,7 @@ def test_subparsers_clean(parser: argparse.ArgumentParser) -> None:
clean command must imply unsafe and no-log
"""
args = parser.parse_args(["clean"])
assert args.no_log
assert args.quiet
assert args.unsafe
@ -100,7 +100,7 @@ def test_subparsers_config(parser: argparse.ArgumentParser) -> None:
args = parser.parse_args(["-a", "x86_64", "config"])
assert args.architecture == ["x86_64"]
assert args.lock is None
assert args.no_log
assert args.quiet
assert args.no_report
assert args.unsafe
@ -169,7 +169,7 @@ def test_subparsers_search(parser: argparse.ArgumentParser) -> None:
args = parser.parse_args(["search", "ahriman"])
assert args.architecture == [""]
assert args.lock is None
assert args.no_log
assert args.quiet
assert args.no_report
assert args.unsafe
@ -190,7 +190,7 @@ def test_subparsers_setup(parser: argparse.ArgumentParser) -> None:
"--repository", "aur-clone"])
assert args.architecture == ["x86_64"]
assert args.lock is None
assert args.no_log
assert args.quiet
assert args.no_report
assert args.unsafe
@ -234,7 +234,7 @@ def test_subparsers_status(parser: argparse.ArgumentParser) -> None:
args = parser.parse_args(["-a", "x86_64", "status"])
assert args.architecture == ["x86_64"]
assert args.lock is None
assert args.no_log
assert args.quiet
assert args.no_report
assert args.unsafe
@ -246,7 +246,7 @@ def test_subparsers_status_update(parser: argparse.ArgumentParser) -> None:
args = parser.parse_args(["-a", "x86_64", "status-update"])
assert args.architecture == ["x86_64"]
assert args.lock is None
assert args.no_log
assert args.quiet
assert args.no_report
assert args.unsafe
@ -288,7 +288,7 @@ def test_subparsers_user(parser: argparse.ArgumentParser) -> None:
args = parser.parse_args(["user", "username"])
assert args.architecture == [""]
assert args.lock is None
assert args.no_log
assert args.quiet
assert args.no_report
assert args.unsafe

View File

@ -90,7 +90,7 @@ def configuration(resource_path_root: Path) -> Configuration:
:return: configuration test instance
"""
path = resource_path_root / "core" / "ahriman.ini"
return Configuration.from_path(path=path, architecture="x86_64", logfile=False)
return Configuration.from_path(path=path, architecture="x86_64", quiet=False)
@pytest.fixture

View File

@ -148,16 +148,16 @@ def test_load_logging_fallback(configuration: Configuration, mocker: MockerFixtu
must fallback to stderr without errors
"""
mocker.patch("logging.config.fileConfig", side_effect=PermissionError())
configuration.load_logging(True)
configuration.load_logging(quiet=False)
def test_load_logging_stderr(configuration: Configuration, mocker: MockerFixture) -> None:
def test_load_logging_quiet(configuration: Configuration, mocker: MockerFixture) -> None:
"""
must use stderr if flag set
must disable logging in case if quiet flag set
"""
logging_mock = mocker.patch("logging.config.fileConfig")
configuration.load_logging(False)
logging_mock.assert_not_called()
disable_mock = mocker.patch("logging.disable")
configuration.load_logging(quiet=True)
disable_mock.assert_called_once()
def test_merge_sections_missing(configuration: Configuration) -> None:

View File

@ -82,3 +82,10 @@ def test_verify_access_write(user: User) -> None:
user.access = UserAccess.Write
assert user.verify_access(UserAccess.Read)
assert user.verify_access(UserAccess.Write)
def test_repr(user: User) -> None:
"""
must print user without password
"""
assert "pa55w0rd" not in str(user)