From 939150289d13b40882f7247d05213a0418076810 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 3 Jan 2018 11:03:19 +0100 Subject: Signature existence tests: Fix generation of the signature file Amends cd1037060e0cbc263e601fb67fbd40d85c8801a1. Task-number: PYSIDE-510 Change-Id: Ic93a6ef4ab846b07b369f691f52240aeedbfbec3 Reviewed-by: Christian Tismer --- sources/pyside2/tests/registry/existence_test.py | 6 +++--- sources/pyside2/tests/registry/init_platform.py | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sources/pyside2/tests/registry/existence_test.py b/sources/pyside2/tests/registry/existence_test.py index 8f3c568a3..3c5b7e545 100644 --- a/sources/pyside2/tests/registry/existence_test.py +++ b/sources/pyside2/tests/registry/existence_test.py @@ -131,16 +131,16 @@ if not have_refmodule and is_ci and qtVersion()[:2] in tested_versions: """ generate_all() sys.stderr.flush() - print("BEGIN_FILE", refPath, file=sys.stderr) + print("BEGIN_FILE", shortpath, file=sys.stderr) with open(refPath) as f: print(f.read(), file=sys.stderr) - print("END_FILE", refPath, file=sys.stderr) + print("END_FILE", shortpath, file=sys.stderr) sys.stderr.flush() raise RuntimeError(dedent(""" {line} ** This is the initial call. You should check this file in: ** {} - **""").format(refPath, line=79 * "*")) + **""").format(shortpath, line=79 * "*")) if __name__ == '__main__': unittest.main() diff --git a/sources/pyside2/tests/registry/init_platform.py b/sources/pyside2/tests/registry/init_platform.py index ffe6e22fc..a8e692d98 100644 --- a/sources/pyside2/tests/registry/init_platform.py +++ b/sources/pyside2/tests/registry/init_platform.py @@ -229,7 +229,9 @@ def enum_all(): return ret def generate_all(): - with open(refPath(), "w") as outfile, open(sourcepath) as f: + refPath = getRefPath() + module = os.path.basename(os.path.splitext(refPath)[0]) + with open(refPath, "w") as outfile, open(sourcepath) as f: fmt = Formatter(outfile) enu = SimplifyingEnumerator(fmt) lines = f.readlines() @@ -254,7 +256,7 @@ def generate_all(): def __main__(): print("+++ generating {}. You should probably check this file in." - .format(refpath)) + .format(getRefPath())) generate_all() if __name__ == "__main__": -- cgit v1.2.3