[RECV-94] Separate docker/robot invoking

[validation.git] / bluval / bluval.py

diff --git a/bluval/bluval.py b/bluval/bluval.py
index bd89a48..a0f02d2 100644 (file)
--- a/bluval/bluval.py
+++ b/bluval/bluval.py
@@ -20,31 +20,54 @@ testcase
 """
 
 import subprocess
 """
 
 import subprocess

+import sys
+import traceback
+from pathlib import Path
+

 import click
 import yaml
 
 import click
 import yaml
 

+from bluutil import BluvalError
+from bluutil import ShowStopperError
+
+

 def run_testcase(testcase):
     """Runs a single testcase
     """
 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')
     what = testcase.get('what')

-    variables = "variables.yaml"
-    results = "results/"+testcase.get('layer')+"/"+what
-    test_path = "tests/"+testcase.get('layer')+"/"+what
-    args = ["robot", "-V", variables, "-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))
+    # 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(args, shell=False)
     print('Invoking {}'.format(args))
     try:
         status = subprocess.call(args, shell=False)

-        if status != 0 and show_stopper:
-            print('Show stopper testcase failed')
-            return status
+        if status != 0 and show_stopper.lower() == "true":
+            raise ShowStopperError(name)

     except OSError:
     except OSError:

-        print('Error while executing {}'.format(args))
-        return -1
-    return status
+        #print('Error while executing {}'.format(args))
+        raise BluvalError(OSError)

 
 
 def validate_layer(blueprint, layer):
 
 
 def validate_layer(blueprint, layer):


@@ -60,14 +83,10 @@ def validate_blueprint(yaml_loc, layer):
     """Parse yaml file and validates given layer. If no layer given all layers
     validated
     """
     """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']
         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()
 
 
 @click.command()


@@ -77,10 +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.
     """
     """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)
+    mypath = Path(__file__).absolute()
+    yaml_loc = mypath.parents[0].joinpath('bluval-{}.yaml'.format(blueprint))

     if layer is not None:
         layer = layer.lower()
     if layer is not None:
         layer = layer.lower()

-    validate_blueprint(yaml_loc, layer)
+    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__":
 
 
 if __name__ == "__main__":