[fix] get_final_benchmark_config is error agnostic (#281)

Author: filipecosta90

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redisbench-admin"
-version = "0.6.16"
+version = "0.6.17"
 description = "Redis benchmark run helper. A wrapper around Redis and Redis Modules benchmark tools ( ftsb_redisearch, memtier_benchmark, redis-benchmark, aibench, etc... )."
 authors = ["filipecosta90 <[email protected]>","Redis Performance Group <[email protected]>"]
 readme = "README.md"

redisbench_admin/utils/benchmark_config.py

@@ -62,10 +62,11 @@ def prepare_benchmark_definitions(args):
     ) = get_defaults(defaults_filename)
     for usecase_filename in files:
         with open(usecase_filename, "r") as stream:
-            benchmark_config, test_name = get_final_benchmark_config(
+            result, benchmark_config, test_name = get_final_benchmark_config(
                 default_kpis, stream, usecase_filename
             )
-            benchmark_definitions[test_name] = benchmark_config
+            if result:
+                benchmark_definitions[test_name] = benchmark_config
     return (
         benchmark_definitions,
         default_metrics,
@@ -109,15 +110,28 @@ def get_defaults(defaults_filename):
 
 
 def get_final_benchmark_config(default_kpis, stream, usecase_filename):
-    os.path.dirname(os.path.abspath(usecase_filename))
-    benchmark_config = yaml.safe_load(stream)
-    kpis_keyname = "kpis"
-    if default_kpis is not None:
-        merge_default_and_specific_properties_dict_type(
-            benchmark_config, default_kpis, kpis_keyname, usecase_filename
+    result = False
+    benchmark_config = None
+    test_name = None
+    try:
+        os.path.dirname(os.path.abspath(usecase_filename))
+        benchmark_config = yaml.safe_load(stream)
+        kpis_keyname = "kpis"
+        if default_kpis is not None:
+            merge_default_and_specific_properties_dict_type(
+                benchmark_config, default_kpis, kpis_keyname, usecase_filename
+            )
+        test_name = benchmark_config["name"]
+        result = True
+    except Exception as e:
+        logging.error(
+            "while loading file {} and error was returned: {}".format(
+                usecase_filename, e.__str__()
+            )
         )
-    test_name = benchmark_config["name"]
-    return benchmark_config, test_name
+        pass
+
+    return result, benchmark_config, test_name
 
 
 def merge_default_and_specific_properties_dict_type(

tests/test_common.py

@@ -369,7 +369,7 @@ def test_extract_test_feasible_setups():
     ) = get_defaults(defaults_filename)
     usecase_filename = "./tests/test_data/tsbs-devops-ingestion-scale100-4days-v2.yml"
     with open(usecase_filename, "r") as stream:
-        benchmark_config, test_name = get_final_benchmark_config(
+        _, benchmark_config, test_name = get_final_benchmark_config(
             default_kpis, stream, usecase_filename
         )
     assert cluster_config == {
@@ -409,6 +409,14 @@ def test_extract_test_feasible_setups():
     assert osscluster_setup_type == t
     assert osscluster_shard_count == c
 
+    # wrong read
+    res, benchmark_config, test_name = get_final_benchmark_config(
+        default_kpis, stream, "dont exist"
+    )
+    assert res == False
+    assert benchmark_config == None
+    assert benchmark_config == None
+
 
 def test_check_dbconfig_tool_requirement():
     with open(