socx-cli 0.2.8__tar.gz → 0.2.10__tar.gz

{socx_cli-0.2.8 → socx_cli-0.2.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: socx-cli
-Version: 0.2.8
+Version: 0.2.10
 Summary: System on chip verification and tooling infrastructure.
 Project-URL: Homepage, https://github.com/runsonmymachine/socx
 Project-URL: Issues, https://github.com/runsonmymachine/socx/issues

socx_cli-0.2.10/assets/rerun/outputs/04-04_passed.log

@@ -0,0 +1,11 @@
+socrun --flow sim --test vbat/pixie_fll_fw_basic_test_rdi_lc_vbat.cfg --seed 0
+socrun --flow sim --test vbat/pixie_fll_fw_basic_test_rdi_lc_vbat.cfg --seed 1609892603
+socrun --flow sim --test vbat/pixie_fll_fw_basic_test_rdi_lc_vbat.cfg --seed 1689043616
+socrun --flow sim --test vbat/pixie_fll_fw_basic_test_symclb_vbat.cfg --seed 0
+socrun --flow sim --test vbat/pixie_fll_fw_basic_test_symclb_vbat.cfg --seed 474267113
+socrun --flow sim --test vbat/pixie_fll_fw_basic_test_symclb_vbat.cfg --seed 533510332
+socrun --flow sim --test vbat/pixie_fw_func_test_dma_vbat.cfg --seed 23688557
+socrun --flow sim --test vbat/pixie_fw_func_test_hws_basic_branch_vbat.cfg --seed 1033297733
+socrun --flow sim --test vbat/pixie_fw_func_test_hws_basic_vbat.cfg --seed 732274191
+socrun --flow sim --test vbat/pixie_fw_radio_test_vbat.cfg --seed 249137077
+socrun --flow sim --test vbat/pixie_fw_radio_test_vbat.cfg --seed 824307247

socx_cli-0.2.10/assets/rerun/outputs/04-05_passed.log

@@ -0,0 +1,11 @@
+socrun --flow sim --test vbat/pixie_fll_fw_basic_test_rdi_lc_vbat.cfg --seed 0
+socrun --flow sim --test vbat/pixie_fll_fw_basic_test_rdi_lc_vbat.cfg --seed 1609892603
+socrun --flow sim --test vbat/pixie_fll_fw_basic_test_rdi_lc_vbat.cfg --seed 1689043616
+socrun --flow sim --test vbat/pixie_fll_fw_basic_test_symclb_vbat.cfg --seed 0
+socrun --flow sim --test vbat/pixie_fll_fw_basic_test_symclb_vbat.cfg --seed 474267113
+socrun --flow sim --test vbat/pixie_fll_fw_basic_test_symclb_vbat.cfg --seed 533510332
+socrun --flow sim --test vbat/pixie_fw_func_test_dma_vbat.cfg --seed 23688557
+socrun --flow sim --test vbat/pixie_fw_func_test_hws_basic_branch_vbat.cfg --seed 1033297733
+socrun --flow sim --test vbat/pixie_fw_func_test_hws_basic_vbat.cfg --seed 732274191
+socrun --flow sim --test vbat/pixie_fw_radio_test_vbat.cfg --seed 249137077
+socrun --flow sim --test vbat/pixie_fw_radio_test_vbat.cfg --seed 824307247

socx_cli-0.2.10/assets/rerun/outputs/04-06_passed.log

@@ -0,0 +1,11 @@
+socrun --flow sim --test vbat/pixie_fll_fw_basic_test_rdi_lc_vbat.cfg --seed 0
+socrun --flow sim --test vbat/pixie_fll_fw_basic_test_rdi_lc_vbat.cfg --seed 1609892603
+socrun --flow sim --test vbat/pixie_fll_fw_basic_test_rdi_lc_vbat.cfg --seed 1689043616
+socrun --flow sim --test vbat/pixie_fll_fw_basic_test_symclb_vbat.cfg --seed 0
+socrun --flow sim --test vbat/pixie_fll_fw_basic_test_symclb_vbat.cfg --seed 474267113
+socrun --flow sim --test vbat/pixie_fll_fw_basic_test_symclb_vbat.cfg --seed 533510332
+socrun --flow sim --test vbat/pixie_fw_func_test_dma_vbat.cfg --seed 23688557
+socrun --flow sim --test vbat/pixie_fw_func_test_hws_basic_branch_vbat.cfg --seed 1033297733
+socrun --flow sim --test vbat/pixie_fw_func_test_hws_basic_vbat.cfg --seed 732274191
+socrun --flow sim --test vbat/pixie_fw_radio_test_vbat.cfg --seed 249137077
+socrun --flow sim --test vbat/pixie_fw_radio_test_vbat.cfg --seed 824307247

socx_cli-0.2.10/assets/rerun/outputs/04-07_failed.log

@@ -0,0 +1,11 @@
+socrun --flow sim --test vbat/pixie_fll_fw_basic_test_rdi_lc_vbat.cfg --seed 0
+socrun --flow sim --test vbat/pixie_fll_fw_basic_test_rdi_lc_vbat.cfg --seed 1609892603
+socrun --flow sim --test vbat/pixie_fll_fw_basic_test_rdi_lc_vbat.cfg --seed 1689043616
+socrun --flow sim --test vbat/pixie_fll_fw_basic_test_symclb_vbat.cfg --seed 0
+socrun --flow sim --test vbat/pixie_fll_fw_basic_test_symclb_vbat.cfg --seed 474267113
+socrun --flow sim --test vbat/pixie_fll_fw_basic_test_symclb_vbat.cfg --seed 533510332
+socrun --flow sim --test vbat/pixie_fw_func_test_dma_vbat.cfg --seed 23688557
+socrun --flow sim --test vbat/pixie_fw_func_test_hws_basic_branch_vbat.cfg --seed 1033297733
+socrun --flow sim --test vbat/pixie_fw_func_test_hws_basic_vbat.cfg --seed 732274191
+socrun --flow sim --test vbat/pixie_fw_radio_test_vbat.cfg --seed 249137077
+socrun --flow sim --test vbat/pixie_fw_radio_test_vbat.cfg --seed 824307247

socx_cli-0.2.10/assets/rerun/outputs/04-11_failed.log

@@ -0,0 +1,11 @@
+socrun --flow sim --test vbat/pixie_fll_fw_basic_test_rdi_lc_vbat.cfg --seed 0
+socrun --flow sim --test vbat/pixie_fll_fw_basic_test_rdi_lc_vbat.cfg --seed 1609892603
+socrun --flow sim --test vbat/pixie_fll_fw_basic_test_rdi_lc_vbat.cfg --seed 1689043616
+socrun --flow sim --test vbat/pixie_fll_fw_basic_test_symclb_vbat.cfg --seed 0
+socrun --flow sim --test vbat/pixie_fll_fw_basic_test_symclb_vbat.cfg --seed 474267113
+socrun --flow sim --test vbat/pixie_fll_fw_basic_test_symclb_vbat.cfg --seed 533510332
+socrun --flow sim --test vbat/pixie_fw_func_test_dma_vbat.cfg --seed 23688557
+socrun --flow sim --test vbat/pixie_fw_func_test_hws_basic_branch_vbat.cfg --seed 1033297733
+socrun --flow sim --test vbat/pixie_fw_func_test_hws_basic_vbat.cfg --seed 732274191
+socrun --flow sim --test vbat/pixie_fw_radio_test_vbat.cfg --seed 249137077
+socrun --flow sim --test vbat/pixie_fw_radio_test_vbat.cfg --seed 824307247

socx_cli-0.2.10/failed_tests_history2.log

@@ -0,0 +1,11 @@
+socrun --flow sim --test vbat/pixie_fll_fw_basic_test_rdi_lc_vbat.cfg --seed 0
+socrun --flow sim --test vbat/pixie_fll_fw_basic_test_rdi_lc_vbat.cfg --seed 1609892603
+socrun --flow sim --test vbat/pixie_fll_fw_basic_test_rdi_lc_vbat.cfg --seed 1689043616
+socrun --flow sim --test vbat/pixie_fll_fw_basic_test_symclb_vbat.cfg --seed 0
+socrun --flow sim --test vbat/pixie_fll_fw_basic_test_symclb_vbat.cfg --seed 474267113
+socrun --flow sim --test vbat/pixie_fll_fw_basic_test_symclb_vbat.cfg --seed 533510332
+socrun --flow sim --test vbat/pixie_fw_func_test_dma_vbat.cfg --seed 23688557
+socrun --flow sim --test vbat/pixie_fw_func_test_hws_basic_branch_vbat.cfg --seed 1033297733
+socrun --flow sim --test vbat/pixie_fw_func_test_hws_basic_vbat.cfg --seed 732274191
+socrun --flow sim --test vbat/pixie_fw_radio_test_vbat.cfg --seed 249137077
+socrun --flow sim --test vbat/pixie_fw_radio_test_vbat.cfg --seed 824307247

{socx_cli-0.2.8 → socx_cli-0.2.10}/pyproject.toml

@@ -15,7 +15,7 @@ packages = ["src/socx", "src/socx_plugins", "src/socx_patches"]
 #
 [project]
 name = "socx-cli"
-version = "0.2.8"
+version = "0.2.10"
 readme = "README.md"
 license = "Apache-2.0 OR MIT"
 authors = [ { name = "Sagi Kimhi", email = "sagi.kim5@gmail.com" } ]

{socx_cli-0.2.8 → socx_cli-0.2.10}/src/socx/regression/regression.py

@@ -136,19 +136,6 @@ class Regression(TestBase):
     async def start(self) -> None:
         """Start the regression."""
         self._status = TestStatus.Pending
-        now = strftime("%H-%M")
-        today = strftime("%d-%m-%Y")
-        tests = set(iter(self))
-        report_dir = Path(self.cfg.report.path) / today
-        report_dir.mkdir(parents=True, exist_ok=True)
-        passed_filepath = report_dir / f"{now}_passed.log"
-        failed_filepath = report_dir / f"{now}_failed.log"
-        passed_file = open_file(
-            str(passed_filepath), mode="w", encoding="utf-8", lazy=True
-        )
-        failed_file = open_file(
-            str(failed_filepath), mode="w", encoding="utf-8", lazy=True
-        )
         try:
             async with aio.TaskGroup() as tg:
                 tg.create_task(self._animate_progress())
@@ -158,18 +145,13 @@ class Regression(TestBase):
             self._status = TestStatus.Finished
             self._result = (
                 TestResult.Passed
-                if all(test.result == TestResult.Passed for test in self)
+                if all(test.passed for test in self)
                 else TestResult.Failed
             )
         except Exception:
             self._status = TestStatus.Terminated
             self._result = TestResult.Failed
             raise
-        finally:
-            passed = {test for test in tests if test.passed}
-            failed = tests.difference(passed)
-            passed_file.write("\n".join(test.command.line for test in passed))
-            failed_file.write("\n".join(test.command.line for test in failed))
 
     @override
     def suspend(self) -> None:
@@ -245,7 +227,7 @@ class Regression(TestBase):
                 try:
                     test = await self.pending.get()
                     await self.messages.put(f"Runner({test.name}): running...")
-                    await aio.create_task(test.start())
+                    await test.start()
                     await self.messages.put(f"Runner({test.name}): done.")
                     self._runner_advance()
                 finally:
@@ -276,6 +258,7 @@ class Regression(TestBase):
         while not self.messages.empty():
             try:
                 msgs += await self.messages.get()
+                msgs += "\n"
             finally:
                 self.messages.task_done()
         return msgs

{socx_cli-0.2.8 → socx_cli-0.2.10}/src/socx/regression/test.py

@@ -224,17 +224,17 @@ class Test(TestBase, UIDMixin):
     @property
     def idle(self) -> bool:
         """True if test has no active process and has not yet started."""
-        return self._proc is None
+        return self._proc is None and self.status is TestStatus.Idle
 
     @property
     def pending(self):
         """The test is scheduled to be started soon but has not yet started."""
-        return self._status == TestStatus.Pending
+        return self._proc is None and self.status == TestStatus.Pending
 
     @property
     def started(self) -> bool:
         """True if test was started via a prior call to method `start`."""
-        return self._proc is not None
+        return self._proc is not None and self.status is TestStatus.Running
 
     @property
     def suspended(self) -> bool:
@@ -249,27 +249,33 @@ class Test(TestBase, UIDMixin):
     @property
     def finished(self) -> bool:
         """True if test finished running without normally interruption."""
-        return self.started and self.returncode is not None
+        return (
+            self.started
+            and self.returncode is not None
+            and self.status is TestStatus.Finished
+        )
 
     @property
     def terminated(self) -> bool:
         """True if test started but was intentionaly terminated."""
-        return self.finished and self.returncode < 0
+        return self.started and self.status is TestStatus.Terminated
 
     @property
     def passed(self) -> bool:
         """True if test has finished running and no errors occured."""
-        return self.finished and self.returncode == 0
+        # change back to finished and return_code == 0 once patch is removed
+        return self.finished and self.result is TestResult.Passed
 
     @property
     def failed(self) -> bool:
         """True if test finished running and at least one error occured."""
-        return self.finished and self.returncode > 0
+        # change back to finished and return_code != 0 once patch is removed
+        return self.finished and self.result is TestResult.Failed
 
     @property
     def stdin(self) -> TextIO | None:
         """The standard input of the test's process or None if not running."""
-        return self._proc.stdin.decode() if self.running else None
+        return None # not currently needed, can be overriden by subclass
 
     @property
     def stdout(self) -> TextIO | None:
@@ -320,7 +326,7 @@ class Test(TestBase, UIDMixin):
     @property
     def runtime_logs(self):
         """Get the simulation's configured runtime path for ouput logs."""
-        return self.runtime_path/self.runtime_cfg.logs.directory
+        return self.runtime_path / self.runtime_cfg.logs.directory
 
     @property
     def dirname(self):
@@ -330,7 +336,7 @@ class Test(TestBase, UIDMixin):
     @override
     async def start(self) -> None:
         """Start a test in a subprocess."""
-        if not self.idle:
+        if self.status not in (TestStatus.Idle, TestStatus.Pending):
             msg = "Cannot start a test when it is already running."
             exc = OSError(msg)
             logger.exception(msg, exc_info=exc, stack_info=True)
@@ -402,7 +408,7 @@ class Test(TestBase, UIDMixin):
     def _parse_result(self) -> TestResult:
         logger.debug(f"parsing result from {self.runtime_path}")
         result_hack = pp_simlog.TestResults()
-        result_hack.reset_log(self.runtime_logs/"run.log")
+        result_hack.reset_log(self.runtime_logs / "run.log")
         try:
             result_hack.parse_log()
         except ValueError:

{socx_cli-0.2.8 → socx_cli-0.2.10}/src/socx_plugins/regression/_cli.py

@@ -1,5 +1,4 @@
 import time
-import asyncio as aio
 from pathlib import Path
 
 import click
@@ -7,7 +6,10 @@ from dynaconf.utils.boxing import DynaBox
 
 from socx import Regression
 from socx import settings
-from socx import logger
+from socx import get_logger
+
+
+logger = get_logger(__name__)
 
 
 def _correct_path_in(input_path: str | Path | None = None) -> Path:
@@ -27,26 +29,26 @@ def _correct_paths_out(
     now = time.strftime("%H-%M")
     today = time.strftime("%d-%m-%Y")
     if output_path is None:
-        output_path: DynaBox = settings.regression.rerun_failure_history.output
+        output_path: DynaBox = settings.regression.report.path
         dir_out: Path = Path(output_path.directory) / today
-        fail_out: Path = Path(dir_out / f"{now}_failed.log")
-        pass_out: Path = Path(dir_out / f"{now}_passed.log")
+        fail_out: Path = Path(dir_out) / f"{now}_failed.log"
+        pass_out: Path = Path(dir_out) / f"{now}_passed.log"
     else:
-        fail_out: Path = Path(output_path / f"{now}_failed.log")
-        pass_out: Path = Path(output_path / f"{now}_passed.log")
+        fail_out: Path = Path(output_path) / f"{now}_failed.log"
+        pass_out: Path = Path(output_path) / f"{now}_passed.log"
     fail_out.parent.mkdir(parents=True, exist_ok=True)
     pass_out.parent.mkdir(parents=True, exist_ok=True)
     return pass_out, fail_out
 
 
 def _write_results(
-    fail_out: str | Path,
     pass_out: str | Path,
+    fail_out: str | Path,
     regression: Regression,
 ) -> None:
     with (
-        open(fail_out, mode="w", encoding="utf-8") as ff,
-        open(pass_out, mode="w", encoding="utf-8") as pf,
+        click.open_file(fail_out, mode="w", encoding="utf-8") as ff,
+        click.open_file(pass_out, mode="w", encoding="utf-8") as pf,
     ):
         for test in regression:
             if test.passed:
@@ -68,4 +70,7 @@ async def _run_from_file(
     path_in = _correct_path_in(input)
     regression = _populate_regression(path_in)
     pass_out, fail_out = _correct_paths_out(output)
-    await regression.start()
+    try:
+        await regression.start()
+    finally:
+        _write_results(pass_out, fail_out, regression)