From 23e96fdc6d6a2d066b21e1a80ac17e00c458123c Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 21 Jul 2023 20:06:53 +0100 Subject: [PATCH] Run `pyupgrade` on the changes from the merge-forward Signed-off-by: Pedro Algarvio --- tests/pytests/functional/modules/test_service.py | 2 +- tests/pytests/functional/states/test_service.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/pytests/functional/modules/test_service.py b/tests/pytests/functional/modules/test_service.py index 51ce7f1cc0b..a54ff1fbe6c 100644 --- a/tests/pytests/functional/modules/test_service.py +++ b/tests/pytests/functional/modules/test_service.py @@ -36,7 +36,7 @@ def service_name(grains, modules): service_name = "Spooler" if os_family != "Windows" and salt.utils.path.which(cmd_name) is None: - pytest.skip("{} is not installed".format(cmd_name)) + pytest.skip(f"{cmd_name} is not installed") if is_systemd and modules.service.offline(): pytest.skip("systemd is OFFLINE") diff --git a/tests/pytests/functional/states/test_service.py b/tests/pytests/functional/states/test_service.py index a1e9673653b..fd023df0637 100644 --- a/tests/pytests/functional/states/test_service.py +++ b/tests/pytests/functional/states/test_service.py @@ -43,7 +43,7 @@ def service_name(grains, modules): service_name = "Spooler" if os_family != "Windows" and salt.utils.path.which(cmd_name) is None: - pytest.skip("{} is not installed".format(cmd_name)) + pytest.skip(f"{cmd_name} is not installed") if is_systemd and modules.service.offline(): pytest.skip("systemd is OFFLINE")