Initial formatting run with Black. Integration tests and unit tests pass before and after this change.

This commit is contained in:
Pim van Pelt
2022-04-22 13:05:55 +00:00
parent b375ddb433
commit baaaaa67b5
22 changed files with 1757 additions and 1178 deletions

View File

@ -27,15 +27,17 @@ except ImportError:
print("ERROR: install argparse manually: sudo pip install argparse")
sys.exit(-2)
def example_validator(yaml):
""" A simple example validator that takes the YAML configuration file as an input,
"""A simple example validator that takes the YAML configuration file as an input,
and returns a tuple of rv (return value, True is success), and a list of string
messages to the validation framework. """
messages to the validation framework."""
rv = True
msgs = []
return rv, msgs
class YAMLTest(unittest.TestCase):
def __init__(self, testName, yaml_filename, yaml_schema):
# calling the super class init varies for different python versions. This works for 2.7
@ -46,19 +48,19 @@ class YAMLTest(unittest.TestCase):
def test_yaml(self):
unittest = None
cfg = None
n=0
n = 0
try:
with open(self.yaml_filename, "r") as f:
for data in yaml.load_all(f, Loader=yaml.Loader):
if n==0:
if n == 0:
unittest = data
n = n + 1
elif n==1:
elif n == 1:
cfg = data
n = n + 1
except:
pass
self.assertEqual(n,2)
self.assertEqual(n, 2)
self.assertIsNotNone(unittest)
if not cfg:
return
@ -68,8 +70,12 @@ class YAMLTest(unittest.TestCase):
msgs_unexpected = 0
msgs_expected = []
if 'test' in unittest and 'errors' in unittest['test'] and 'expected' in unittest['test']['errors']:
msgs_expected = unittest['test']['errors']['expected']
if (
"test" in unittest
and "errors" in unittest["test"]
and "expected" in unittest["test"]["errors"]
):
msgs_expected = unittest["test"]["errors"]["expected"]
fail = False
for m in msgs:
@ -83,11 +89,18 @@ class YAMLTest(unittest.TestCase):
fail = True
count = 0
if 'test' in unittest and 'errors' in unittest['test'] and 'count' in unittest['test']['errors']:
count = unittest['test']['errors']['count']
if (
"test" in unittest
and "errors" in unittest["test"]
and "count" in unittest["test"]["errors"]
):
count = unittest["test"]["errors"]["count"]
if len(msgs) != count:
print(f"{self.yaml_filename}: Unexpected error count {len(msgs)} (expecting {int(count)})", file=sys.stderr)
print(
f"{self.yaml_filename}: Unexpected error count {len(msgs)} (expecting {int(count)})",
file=sys.stderr,
)
self.assertEqual(len(msgs), count)
self.assertFalse(fail)
@ -96,27 +109,63 @@ class YAMLTest(unittest.TestCase):
if __name__ == "__main__":
parser = argparse.ArgumentParser(formatter_class=argparse.RawTextHelpFormatter)
parser.add_argument('-t', '--test', dest='test', type=str, nargs='+', default=['unittest/yaml/*.yaml'], help="""YAML test file(s)""")
parser.add_argument('-s', '--schema', dest='schema', type=str, default='./schema.yaml', help="""YAML schema validation file""")
parser.add_argument('-d', '--debug', dest='debug', action='store_true', help="""Enable debug, default False""")
parser.add_argument('-q', '--quiet', dest='quiet', action='store_true', help="""Be quiet (only log warnings/errors), default False""")
parser.add_argument(
"-t",
"--test",
dest="test",
type=str,
nargs="+",
default=["unittest/yaml/*.yaml"],
help="""YAML test file(s)""",
)
parser.add_argument(
"-s",
"--schema",
dest="schema",
type=str,
default="./schema.yaml",
help="""YAML schema validation file""",
)
parser.add_argument(
"-d",
"--debug",
dest="debug",
action="store_true",
help="""Enable debug, default False""",
)
parser.add_argument(
"-q",
"--quiet",
dest="quiet",
action="store_true",
help="""Be quiet (only log warnings/errors), default False""",
)
args = parser.parse_args()
if args.debug:
verbosity=2
verbosity = 2
elif args.quiet:
verbosity=0
verbosity = 0
else:
verbosity=1
verbosity = 1
yaml_suite = unittest.TestSuite()
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).wasSuccessful()
yaml_suite.addTest(
YAMLTest("test_yaml", yaml_filename=fn, yaml_schema=args.schema)
)
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()
tests = unittest.TestLoader().discover(start_dir=".", pattern="test_*.py")
unit_ok = (
unittest.TextTestRunner(verbosity=verbosity, buffer=True)
.run(tests)
.wasSuccessful()
)
retval = 0
if not yaml_ok: