From 540c1bb660b3ea671f442a2e429db6d2bc1a7244 Mon Sep 17 00:00:00 2001 From: CentOS CI Date: Nov 11 2019 18:33:02 +0000 Subject: Test and display both runtime and buildroot defaults Signed-off-by: CentOS CI --- diff --git a/tests/validate.py b/tests/validate.py index cb77ab6..b6094af 100755 --- a/tests/validate.py +++ b/tests/validate.py @@ -143,6 +143,22 @@ def main(): try: idx = Modulemd.ModuleIndex() idx.update_from_defaults_directory(path=defaults_dir, + strict=True) + except GLib.Error as e: + error("Could not merge all defaults: {}".format(e.message)) + result = os.EX_DATAERR + + if result == os.EX_OK: + info("Merging all of the documents encountered no errors.") + + print("\nDefault streams (Runtime):") + print("================") + for m, s in idx.get_default_streams().items(): + print("{}:{}".format(m, s)) + + try: + idx = Modulemd.ModuleIndex() + idx.update_from_defaults_directory(path=defaults_dir, overrides_path=overrides_dir, strict=True) except GLib.Error as e: @@ -152,7 +168,7 @@ def main(): if result == os.EX_OK: info("Merging all of the documents encountered no errors.") - print("\nDefault streams:") + print("\nDefault streams (Buildroot):") print("================") for m, s in idx.get_default_streams().items(): print("{}:{}".format(m, s))