]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
tests: convert remaining printf-style formatting 820/head
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Mon, 4 Oct 2021 09:05:45 +0000 (11:05 +0200)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 5 Oct 2021 07:59:14 +0000 (09:59 +0200)
For some reason, pyupgrade misses those.

tests/conftest.py

index ee41db62d276f3f53421afe6c914434b99ac043c..266d0d26a0899d7210630223200aa1d6007f7a5b 100644 (file)
@@ -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