Skip to content

generate-jobs: print diff in case of failure #36831

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pohly wants to merge 1 commit into
base: master
Choose a base branch
from
Open

generate-jobs: print diff in case of failure #36831

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions hack/generate-jobs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

import argparse
import configparser
import filecmp
import difflib
import os
import pathlib
import shutil
Expand Down Expand Up @@ -107,22 +107,24 @@ def generate_one(path: pathlib.Path, verify: bool) -> typing.List[str]:
errors.append(f"Can't verify content: {out} doesn't exist")
continue
else:
equal = filecmp.cmp(out, tmp.name, shallow=False)
with open(tmp.name) as expected, open(out) as actual:
diff = difflib.context_diff(actual.readlines(), expected.readlines(),
fromfile="actual", tofile="expected")
diff = ''.join(diff)
if verify:
os.unlink(tmp.name)
if not equal:
if diff != "":
errors.append(
f"Generated content for {out} differs from existing"
f"Generated content for {out} differs from existing:\n{diff}"
)
continue
if equal:
if diff == "":
os.unlink(tmp.name)
continue
shutil.move(tmp.name, out)

return errors


def main(argv):
"""Entry point."""
parser = argparse.ArgumentParser(
Expand Down