spl-core 4.1.0__py3-none-any.whl → 4.1.1__py3-none-any.whl

spl_core/__init__.py

@@ -1 +1 @@
-__version__ = "4.1.0"
+__version__ = "4.1.1"

spl_core/test_utils/base_variant_test_runner.py

@@ -27,7 +27,7 @@ class BaseVariantTestRunner(ABC):
 
     @property
     def expected_variant_report_artifacts(self) -> List[Path]:
-        return [Path("reports/reports/index.html")]
+        return [Path("reports/html/index.html")]
 
     @property
     def expected_component_report_artifacts(self) -> List[Path]:
@@ -39,23 +39,29 @@ class BaseVariantTestRunner(ABC):
             Path("coverage/index.html"),
         ]
 
+    def assert_artifact_exists(self, dir: Path, artifact: Path) -> None:
+        if artifact.is_absolute():
+            assert artifact.exists(), f"Artifact {artifact} does not exist"  # noqa: S101
+        else:
+            assert Path.joinpath(dir, artifact).exists(), f"Artifact {Path.joinpath(dir, artifact)} does not exist"  # noqa: S101
+
     def test_build(self) -> None:
         spl_build: SplBuild = SplBuild(variant=self.variant, build_kit="prod")
         assert 0 == spl_build.execute(target="all")  # noqa: S101
         for artifact in self.expected_build_artifacts:
-            assert artifact.exists() or Path.joinpath(spl_build.build_dir, artifact).exists()  # noqa: S101
+            self.assert_artifact_exists(dir=spl_build.build_dir, artifact=artifact)
 
     def test_unittest(self) -> None:
         spl_build: SplBuild = SplBuild(variant=self.variant, build_kit="test")
         assert 0 == spl_build.execute(target="unittests")  # noqa: S101
         for artifact in self.expected_test_artifacts:
-            assert artifact.exists()  # noqa: S101
+            self.assert_artifact_exists(dir=spl_build.build_dir, artifact=artifact)
 
     def test_reports(self) -> None:
         spl_build: SplBuild = SplBuild(variant=self.variant, build_kit="test")
         assert 0 == spl_build.execute(target="all")  # noqa: S101
         for artifact in self.expected_variant_report_artifacts:
-            assert Path.joinpath(spl_build.build_dir, artifact).exists()  # noqa: S101
+            self.assert_artifact_exists(dir=spl_build.build_dir, artifact=artifact)
         for component in self.component_paths:
             for artifact in self.expected_component_report_artifacts:
-                assert Path.joinpath(spl_build.build_dir, component, artifact).exists()  # noqa: S101
+                self.assert_artifact_exists(dir=Path.joinpath(spl_build.build_dir, "reports", "html", spl_build.build_dir, component, "reports"), artifact=artifact)

{spl_core-4.1.0.dist-info → spl_core-4.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: spl-core
-Version: 4.1.0
+Version: 4.1.1
 Summary: Software Product Line Support for CMake
 Home-page: https://github.com/avengineers/spl-core
 License: MIT

{spl_core-4.1.0.dist-info → spl_core-4.1.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-spl_core/__init__.py,sha256=jegJMYuSW90VKiMotVdNAakBvYVPirm-A5oeyJVuhH8,22
+spl_core/__init__.py,sha256=NtWqZUv_8plp1gndoYX_eAqe7K65oPMh-hIvB4Evdc8,22
 spl_core/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 spl_core/common/cmake.py,sha256=qId_QIGqvG_qkJWOTJjiW723nev6p0vvP3O0Jlfppz4,2054
 spl_core/common/command_line_executor.py,sha256=2ck2ndExyjfFORGMHhtOPTWA3gJGJ_GdZfopen2ISoY,2019
@@ -60,9 +60,9 @@ spl_core/project_creator/templates/variant/{{cookiecutter.flavor}}/{{cookiecutte
 spl_core/project_creator/templates/variant/{{cookiecutter.flavor}}/{{cookiecutter.subsystem}}/parts.cmake,sha256=s-SMLPvajH4ZGupruSuh-SbL8jackverQpxGqdoD-Io,77
 spl_core/project_creator/variant.py,sha256=juZWBvLT7i1ZtP1LlGBDalzTf0mhFvfoON43VoqjZOA,532
 spl_core/project_creator/workspace_artifacts.py,sha256=E4oZjnFgC2-cz9jYIYUZzOC9R07LBJAbgGwHAuK0Arg,1279
-spl_core/test_utils/base_variant_test_runner.py,sha256=xoMiNxCxXNyNdwAJ0xmzwqgMPrNJOSeanbttlDOxQSA,2256
+spl_core/test_utils/base_variant_test_runner.py,sha256=FRPkyEyUVsFMmfshzooXzOPUeYaoMBQKFVi5m671P38,2665
 spl_core/test_utils/spl_build.py,sha256=J7gj9Q979pivkYi6Bm2YUSCpjCXQ72rioCZbAgcCoLY,2172
-spl_core-4.1.0.dist-info/LICENSE,sha256=UjjA0o8f5tT3wVm7qodTLAhPWLl6kgVyn9FPAd1VeYY,1099
-spl_core-4.1.0.dist-info/METADATA,sha256=VHPQGIRfVlJq74E4--POmNp3_aC1Ir3_Qmh3SdV41g8,1997
-spl_core-4.1.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-spl_core-4.1.0.dist-info/RECORD,,
+spl_core-4.1.1.dist-info/LICENSE,sha256=UjjA0o8f5tT3wVm7qodTLAhPWLl6kgVyn9FPAd1VeYY,1099
+spl_core-4.1.1.dist-info/METADATA,sha256=T0AkQPYgFf7UCpqGiAZqJ26AN_0l39OT7_qcbG9XKfg,1997
+spl_core-4.1.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+spl_core-4.1.1.dist-info/RECORD,,