Give better error if unexpected Yaml format

Signed-off-by: Erik Jaegervall <[email protected]>

src/vss_tools/main.py

@@ -24,7 +24,7 @@
 )
 from vss_tools.tree import ModelValidationException, VSSNode, build_tree
 from vss_tools.units_quantities import load_quantities, load_units
-from vss_tools.vspec import InvalidSpecDuplicatedEntryException, load_vspec
+from vss_tools.vspec import InvalidSpecDuplicatedEntryException, InvalidSpecException, load_vspec
 
 
 class NameViolationException(Exception):
@@ -215,7 +215,7 @@ def get_trees(
     try:
         types_root = get_types_root(types, unique_include_dirs)
         vspec_data = load_vspec(unique_include_dirs, [vspec] + list(overlays))
-    except InvalidSpecDuplicatedEntryException as e:
+    except (InvalidSpecDuplicatedEntryException, InvalidSpecException) as e:
         log.critical(e)
         exit(1)
 

src/vss_tools/vspec.py

@@ -23,6 +23,10 @@ class IncludeNotFoundException(Exception):
     pass
 
 
+class InvalidSpecException(Exception):
+    pass
+
+
 class InvalidSpecDuplicatedEntryException(Exception):
     pass
 
@@ -80,6 +84,10 @@ def __init__(
         if self.data is None:
             self.data = {}
 
+        for key, value in self.data.items():
+            if not isinstance(value, dict):
+                raise InvalidSpecException(f"{self.source.absolute()}, Invalid key value: {key}={value}")
+
         if prefix:
             tmp_data = {}
             for k, v in self.data.items():

tests/vspec/test_faulty_vspec_format/test_faulty_vspec_format.py

@@ -0,0 +1,32 @@
+# Copyright (c) 2022 Contributors to COVESA
+#
+# This program and the accompanying materials are made available under the
+# terms of the Mozilla Public License 2.0 which is available at
+# https://www.mozilla.org/en-US/MPL/2.0/
+#
+# SPDX-License-Identifier: MPL-2.0
+
+import subprocess
+from pathlib import Path
+
+import pytest
+
+HERE = Path(__file__).resolve().parent
+TEST_UNITS = HERE / ".." / "test_units.yaml"
+TEST_QUANT = HERE / ".." / "test_quantities.yaml"
+
+
+@pytest.mark.parametrize(
+    "filename, error",
+    [
+        ("test_single_level.vspec", "Invalid key value: A=None"),
+        ("test_string_as_child.vspec", "Invalid key value: A=string"),
+    ],
+)
+def test_error(tmp_path, filename, error):
+    spec = HERE / filename
+    output = tmp_path / "out.json"
+    cmd = f"vspec export json -u {TEST_UNITS} -q {TEST_QUANT} --vspec {spec} --output {output}"
+    process = subprocess.run(cmd.split(), capture_output=True, text=True)
+    assert process.returncode != 0
+    assert error in process.stdout