From: Zbigniew Jędrzejewski-Szmek Date: Mon, 4 Oct 2021 09:05:45 +0000 (+0200) Subject: tests: convert remaining printf-style formatting X-Git-Tag: v11~37^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F820%2Fhead;p=thirdparty%2Fmkosi.git tests: convert remaining printf-style formatting For some reason, pyupgrade misses those. --- diff --git a/tests/conftest.py b/tests/conftest.py index ee41db62d..266d0d26a 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -40,13 +40,13 @@ def pytest_assertrepr_compare(op, left, right): def compare_job_args(job, l_a, r_a): ddiff = DictDiffer(l_a, r_a) - ret.append("Comparing parsed configuration %s against expected configuration:" % job) + ret.append(f'Comparing parsed configuration {job} against expected configuration:') ret.append("unexpected:") - ret.extend(["- %s" % i for i in ddiff.unexpected]) + ret.extend([f'- {i}' for i in ddiff.unexpected]) ret.append("missing:") - ret.extend(["- %s" % i for i in ddiff.missing]) + ret.extend([f'- {i}' for i in ddiff.missing]) ret.append("invalid:") - ret.extend(["- %s" % i for i in ddiff.invalid]) + ret.extend([f'- {i}' for i in ddiff.invalid]) verified_keys = [] ret = ["MkosiConfig is not equal to parsed args"] @@ -54,12 +54,12 @@ def pytest_assertrepr_compare(op, left, right): try: left_args = left.reference_config[right_job] except KeyError: - ret.append("Unexpected job: %s" % right_job) + ret.append(f'Unexpected job: {right_job}') continue r_v = vars(right_args) compare_job_args(right_job, left_args, r_v) verified_keys.append(right_job) for left_job in left.reference_config: if not left_job in verified_keys: - ret.append("Missing job: %s" % left_job) + ret.append(f'Missing job: {left_job}') return ret