From 2e2f63e1dde89facde44b1352813a9ebdc919481 Mon Sep 17 00:00:00 2001 From: Pim van Pelt Date: Thu, 24 Mar 2022 15:15:26 +0000 Subject: [PATCH] Fix reporting of YAML tests; send retval based on the bitflags of tests passing/failing --- tests.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tests.py b/tests.py index 12c9151..690be44 100755 --- a/tests.py +++ b/tests.py @@ -103,11 +103,14 @@ if __name__ == "__main__": for pattern in args.test: for fn in glob.glob(pattern): yaml_suite.addTest(YAMLTest('test_yaml', yaml_filename=fn, yaml_schema=args.schema)) - yaml_ok = unittest.TextTestRunner(verbosity=verbosity, buffer=True).run(yaml_suite) + yaml_ok = unittest.TextTestRunner(verbosity=verbosity, buffer=True).run(yaml_suite).wasSuccessful() tests = unittest.TestLoader().discover(start_dir=".", pattern='test_*.py') unit_ok = unittest.TextTestRunner(verbosity=verbosity, buffer=True).run(tests).wasSuccessful() - if not yaml_ok or not unit_ok: - sys.exit(-1) - sys.exit(0) + retval = 0 + if not yaml_ok: + retval = retval - 1 + if not unit_ok: + retval = retval - 2 + sys.exit(retval)