NoneType fixed

[validation.git] / bluval / bluval.py

diff --git a/bluval/bluval.py b/bluval/bluval.py
index 4a01a92..bd89a48 100644 (file)
--- a/bluval/bluval.py
+++ b/bluval/bluval.py
@@ -28,19 +28,21 @@ def run_testcase(testcase):
     """
     show_stopper = testcase.get('show_stopper', False)
     what = testcase.get('what')
-    results = "results/"+what
-    command = '{} {} {} {}'.format("robot", "-d", results, 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]
 
     print('Executing testcase {}'.format(testcase['name']))
     print('          show_stopper {}'.format(show_stopper))
-    print('Invoking {}'.format(command))
+    print('Invoking {}'.format(args))
     try:
-        status = subprocess.call(command, shell=True)
+        status = subprocess.call(args, shell=False)
         if status != 0 and show_stopper:
             print('Show stopper testcase failed')
             return status
     except OSError:
-        print('Error while executing {}'.format(command))
+        print('Error while executing {}'.format(args))
         return -1
     return status
 
@@ -50,6 +52,7 @@ def validate_layer(blueprint, layer):
     """
     print('## Layer {}'.format(layer))
     for testcase in blueprint[layer]:
+        testcase['layer'] = layer
         run_testcase(testcase)
 
 
@@ -75,7 +78,8 @@ def main(blueprint, layer):
     yaml location from blueprint name. Invokes validate on blue print.
     """
     yaml_loc = 'bluval/bluval-{}.yaml'.format(blueprint)
-    layer = layer.lower()
+    if layer is not None:
+        layer = layer.lower()
     validate_blueprint(yaml_loc, layer)