X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=validation.git;a=blobdiff_plain;f=bluval%2Fbluval.py;h=a0f02d2caadf4d7cbf9f5c72ce65abdd5386630d;hp=01b402af6b613fd5c5620d24d6f3bcccf5fd9183;hb=5e95a40c528d9c6ae881a0e9c49628bb20c344ec;hpb=bd9a2c23681b068c3675ccc228fc641956b3db84

diff --git a/bluval/bluval.py b/bluval/bluval.py
index 01b402a..a0f02d2 100644
--- a/bluval/bluval.py
+++ b/bluval/bluval.py
@@ -20,30 +20,54 @@ testcase
 """
 
 import subprocess
+import sys
+import traceback
+from pathlib import Path
+
 import click
 import yaml
 
+from bluutil import BluvalError
+from bluutil import ShowStopperError
+
+
 def run_testcase(testcase):
     """Runs a single testcase
     """
-    show_stopper = testcase.get('show_stopper', False)
+    name = testcase.get('name')
+    skip = testcase.get('skip', "False")
+    if skip.lower() == "true":
+        # skip is mentioned and true.
+        print('Skipping {}'.format(name))
+        return
+    show_stopper = testcase.get('show_stopper', "False")
     what = testcase.get('what')
-    results = "results/"+testcase.get('layer')+"/"+what
-    test_path = "tests/"+testcase.get('layer')+"/"+what
-    command = '{} {} {} {}'.format("robot", "-d", results, test_path)
+    mypath = Path(__file__).absolute()
+    results_path = mypath.parents[2].joinpath(
+        "results/"+testcase.get('layer')+"/"+what)
+    test_path = mypath.parents[1].joinpath(
+        "tests/"+testcase.get('layer')+"/"+what)
 
-    print('Executing testcase {}'.format(testcase['name']))
-    print('          show_stopper {}'.format(show_stopper))
-    print('Invoking {}'.format(command))
+    # add to the variables file the path to where to sotre the logs
+    variables_file = mypath.parents[1].joinpath("tests/variables.yaml")
+    variables_dict = yaml.safe_load(variables_file.open())
+    variables_dict['log_path'] = str(results_path)
+    variables_file.write_text(str(variables_dict))
+
+    # run the test
+    args = ["robot", "-V", str(variables_file), "-d",
+            str(results_path), str(test_path)]
+
+    print('Executing testcase {}'.format(name))
+    print('show_stopper {}'.format(show_stopper))
+    print('Invoking {}'.format(args))
     try:
-        status = subprocess.call(command, shell=True)
-        if status != 0 and show_stopper:
-            print('Show stopper testcase failed')
-            return status
+        status = subprocess.call(args, shell=False)
+        if status != 0 and show_stopper.lower() == "true":
+            raise ShowStopperError(name)
     except OSError:
-        print('Error while executing {}'.format(command))
-        return -1
-    return status
+        #print('Error while executing {}'.format(args))
+        raise BluvalError(OSError)
 
 
 def validate_layer(blueprint, layer):
@@ -59,14 +83,10 @@ def validate_blueprint(yaml_loc, layer):
     """Parse yaml file and validates given layer. If no layer given all layers
     validated
     """
-    with open(yaml_loc) as yaml_file:
+    with open(str(yaml_loc)) as yaml_file:
         yamldoc = yaml.safe_load(yaml_file)
     blueprint = yamldoc['blueprint']
-    if layer is None:
-        for each_layer in blueprint['layers']:
-            validate_layer(blueprint, each_layer)
-    else:
-        validate_layer(blueprint, layer)
+    validate_layer(blueprint, layer)
 
 
 @click.command()
@@ -76,9 +96,23 @@ def main(blueprint, layer):
     """Takes blueprint name and optional layer. Validates inputs and derives
     yaml location from blueprint name. Invokes validate on blue print.
     """
-    yaml_loc = 'bluval/bluval-{}.yaml'.format(blueprint)
-    layer = layer.lower()
-    validate_blueprint(yaml_loc, layer)
+    mypath = Path(__file__).absolute()
+    yaml_loc = mypath.parents[0].joinpath('bluval-{}.yaml'.format(blueprint))
+    if layer is not None:
+        layer = layer.lower()
+    try:
+        validate_blueprint(yaml_loc, layer)
+    except ShowStopperError as err:
+        print('ShowStopperError:', err)
+    except BluvalError as err:
+        print('Unexpected BluvalError', err)
+        raise
+    except:
+        print("Exception in user code:")
+        print("-"*60)
+        traceback.print_exc(file=sys.stdout)
+        print("-"*60)
+        raise
 
 
 if __name__ == "__main__":