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"]
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