From be9fe2077b219a18e2b03fde3bf76aa3a999c12a Mon Sep 17 00:00:00 2001 From: Ioakeim Samaras Date: Wed, 24 Jul 2019 15:25:38 +0300 Subject: [PATCH] Support of test cases' addtitional tag Test cases can now be tagged as optional Signed-off-by: Ioakeim Samaras Change-Id: I97e217ff3c1270d56853bab36c97b75c056f5151 --- bluval/bluval-rec.yaml | 1 + bluval/bluval.py | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/bluval/bluval-rec.yaml b/bluval/bluval-rec.yaml index 4328b68..bde9b47 100644 --- a/bluval/bluval-rec.yaml +++ b/bluval/bluval-rec.yaml @@ -34,3 +34,4 @@ blueprint: - name: conformance what: conformance + optional: "True" diff --git a/bluval/bluval.py b/bluval/bluval.py index a0f02d2..bcdc856 100644 --- a/bluval/bluval.py +++ b/bluval/bluval.py @@ -30,16 +30,23 @@ import yaml from bluutil import BluvalError from bluutil import ShowStopperError +_OPTIONAL_ALSO = False def run_testcase(testcase): """Runs a single testcase """ name = testcase.get('name') skip = testcase.get('skip', "False") + optional = testcase.get('optional', "False") if skip.lower() == "true": # skip is mentioned and true. print('Skipping {}'.format(name)) return + print("_OPTIONAL_ALSO {}".format(_OPTIONAL_ALSO)) + if not _OPTIONAL_ALSO and optional.lower() == "true": + # Optional Test case. + print('Ignoring Optional {} testcase'.format(name)) + return show_stopper = testcase.get('show_stopper', "False") what = testcase.get('what') mypath = Path(__file__).absolute() @@ -92,14 +99,20 @@ def validate_blueprint(yaml_loc, layer): @click.command() @click.argument('blueprint') @click.option('--layer', '-l') -def main(blueprint, layer): +@click.option('--optional_also', '-o', is_flag=True) +def main(blueprint, layer, optional_also): """Takes blueprint name and optional layer. Validates inputs and derives yaml location from blueprint name. Invokes validate on blue print. """ + global _OPTIONAL_ALSO # pylint: disable=global-statement mypath = Path(__file__).absolute() yaml_loc = mypath.parents[0].joinpath('bluval-{}.yaml'.format(blueprint)) if layer is not None: layer = layer.lower() + if optional_also: + _OPTIONAL_ALSO = True + print("_OPTIONAL_ALSO {}".format(_OPTIONAL_ALSO)) + try: validate_blueprint(yaml_loc, layer) except ShowStopperError as err: -- 2.16.6